From b2d07def7e7bf2c8769fab89a6aac2598a9e5c11 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 19 Mar 2022 09:08:45 -0400
Subject: [PATCH] Fixed display cutoff in Senate game.

---
 html-src/rules/senate.html     | 26 ++++++++++++++++++++++++++
 html-src/rules/senateplus.html | 12 ++++++++++++
 pysollib/games/klondike.py     |  5 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 html-src/rules/senate.html
 create mode 100644 html-src/rules/senateplus.html

diff --git a/html-src/rules/senate.html b/html-src/rules/senate.html
new file mode 100644
index 00000000..1a564ca8
--- /dev/null
+++ b/html-src/rules/senate.html
@@ -0,0 +1,26 @@
+<h1>Senate</h1>
+<p>
+Raglan type. 2 decks. No redeals.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Rules</h3>
+<p>
+A card is dealt to each of four tableau piles,
+and eight reserve piles.  The aces are all dealt
+to the foundations.  The tableau piles are built
+down by same suit, and any card or sequence of
+cards can be moved between tableau piles.  Any card
+or sequence can be moved to an empty tableau pile.
+You cannot build on the reserves, and cards can only
+be moved from the reserves to the tableau or
+foundation one at a time.
+<p>
+When there are no moves left, you can deal a single
+card from the deck to each of the reserve piles.
+<p>
+The foundations are built up by suit from ace to
+king.  The game is won when all cards are moved
+to the foundations.
diff --git a/html-src/rules/senateplus.html b/html-src/rules/senateplus.html
new file mode 100644
index 00000000..5d1b3915
--- /dev/null
+++ b/html-src/rules/senateplus.html
@@ -0,0 +1,12 @@
+<h1>Senate+</h1>
+<p>
+Raglan type. 2 decks. No redeal.
+
+<h3>Object</h3>
+<p>
+Move all cards to the foundations.
+
+<h3>Quick Description</h3>
+<p>
+Just like <a href="senate.html">Senate</a>, but with five
+tableau piles.
diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py
index d46b734d..b4f4fd8c 100644
--- a/pysollib/games/klondike.py
+++ b/pysollib/games/klondike.py
@@ -745,8 +745,9 @@ class Senate(Jane):
         playcards = 10
 
         lay, s = Layout(self), self.s
-        self.setSize(lay.XM+(rows+7)*lay.XS,
-                     lay.YM+2*(lay.YS+playcards*lay.YOFFSET))
+        self.setSize(lay.XM + (rows + 7) * lay.XS,
+                     max(lay.YM + 2 * (lay.YS + playcards * lay.YOFFSET),
+                         lay.YS * 5))
 
         x, y = lay.XM, lay.YM
         for i in range(rows):