From 53bb15b37307e51c1bb1db9af441c9a80cb69114 Mon Sep 17 00:00:00 2001 From: Joe R Date: Mon, 19 Sep 2022 23:49:23 -0400 Subject: [PATCH] Fixed the select game and cardset windows after adding scaling options. --- pysollib/tile/selectcardset.py | 3 ++- pysollib/tile/selectgame.py | 3 ++- pysollib/tile/selecttile.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index d538137e..7c0c3c11 100644 --- a/pysollib/tile/selectcardset.py +++ b/pysollib/tile/selectcardset.py @@ -373,7 +373,8 @@ class SelectCardsetDialogWithPreview(MfxDialog): left_frame.columnconfigure(0, weight=1) # self.preview = MfxScrolledCanvas(right_frame) - self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.setTile(app, app.tabletile_index, + app.opt.tabletile_scale_method, force=True) self.preview.pack(fill='both', expand=True, padx=padx, pady=pady) self.preview.canvas.preview = 1 # create a preview of the current state diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 59ea735b..7754c66b 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -469,7 +469,8 @@ class SelectGameDialogWithPreview(SelectGameDialog): stats_frame.rowconfigure(6, weight=1) # Canvas self.preview = MfxScrolledCanvas(right_frame) - self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.setTile(app, app.tabletile_index, + app.opt.tabletile_scale_method, force=True) self.preview.grid(row=1, column=0, columnspan=3, padx=padx, pady=pady, sticky='nsew') right_frame.columnconfigure(1, weight=1) diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 614cada3..44e6fd24 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -374,7 +374,7 @@ class SelectTileDialogWithPreview(MfxDialog): if tile: if USE_PIL: if tile.stretch: - self.textScale['state'] = 'normal' + self.textScale['state'] = 'readonly' else: self.textScale['state'] = 'disabled' if self.preview.setTile(self.app, key, scaling):