From 13d34238e2b2646f8ca4c214c64f24ca9e3e4da3 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 9 Sep 2021 20:09:29 -0400 Subject: [PATCH] Fixed window/tree scaling on smaller screens. --- pysollib/tile/selectcardset.py | 2 +- pysollib/tile/selectgame.py | 2 +- pysollib/tile/selecttile.py | 2 +- pysollib/ui/tktile/selecttree.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index f94b9fff..ea7f4b42 100644 --- a/pysollib/tile/selectcardset.py +++ b/pysollib/tile/selectcardset.py @@ -231,7 +231,7 @@ class SelectCardsetDialogWithPreview(MfxDialog): sh = self.top.winfo_screenheight() h = sh * .8 - w1, w2 = min(300, sw / 4), max(sw / 2 + ((sw / 4) - 300), sw / 2) + w1, w2 = min(300, sw / 2.5), max(sw / 2 + ((sw / 2.5) - 300), sw / 2) paned_window = ttk.PanedWindow(top_frame, orient='horizontal') paned_window.pack(expand=True, fill='both') left_frame = ttk.Frame(paned_window) diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 99211d58..6525b207 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -356,7 +356,7 @@ class SelectGameDialogWithPreview(SelectGameDialog): sh = self.top.winfo_screenheight() h = sh * .8 - w1, w2 = min(250, sw / 3), max(sw / 2 + ((sw / 3) - 250), sw / 2) + w1, w2 = min(250, sw / 2.5), max(sw / 2 + ((sw / 2.5) - 250), sw / 2) # print sw, w1, w2 # w2 = max(200, min(w2, 10 + 12 * (app.subsampled_images.CARDW + 10))) diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 843b1186..6e1baf26 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -132,7 +132,7 @@ class SelectTileDialogWithPreview(MfxDialog): sh = self.top.winfo_screenheight() h = sh * .8 - w1, w2 = min(250, sw / 4), max(sw / 2 + ((sw / 4) - 250), sw / 2) + w1, w2 = min(250, sw / 2.5), max(sw / 2 + ((sw / 2.5) - 250), sw / 2) font = app.getFont("default") padx, pady = 4, 4 diff --git a/pysollib/ui/tktile/selecttree.py b/pysollib/ui/tktile/selecttree.py index 730db7cf..c3e8c0b6 100644 --- a/pysollib/ui/tktile/selecttree.py +++ b/pysollib/ui/tktile/selecttree.py @@ -99,6 +99,7 @@ class BaseSelectDialogTreeCanvas: height = 25 * disty if parent and parent.winfo_screenheight() >= 800: height = 30 * disty + height = min(height, parent.winfo_screenheight() * .35) self.lines = height // disty self._calc_MfxTreeInCanvas().__init__( self, parent, self.data.rootnodes,