anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-22 03:04:09 -04:00
Code Releases Activity

Fix synchronization of cardset scaling options

Browse source
This commit is contained in:
Joe R 2025-04-17 19:06:21 -04:00
parent 9d19330a8c
commit f21c45ce73
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/app.py
View file

@ -987,7 +987,8 @@ class Application:
changed = False
if USE_PIL:
if (self.opt.scale_x, self.opt.scale_y,
self.opt.auto_scale, self.opt.spread_stacks,
self.opt.auto_scale, self.opt.preview_scale,
self.opt.spread_stacks,
self.opt.preserve_aspect_ratio) != \
d.scale_values or \
(cs.CARD_XOFFSET, cs.CARD_YOFFSET) != d.cardset_values:
@ -998,6 +999,7 @@ class Application:
(self.opt.scale_x,
self.opt.scale_y,
self.opt.auto_scale,
self.opt.preview_scale,
self.opt.spread_stacks,
self.opt.preserve_aspect_ratio) = d.scale_values
if not self.opt.auto_scale:

8
pysollib/tile/selectcardset.py
View file

@ -373,7 +373,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
self.aspect_check = ttk.Checkbutton(
size_frame, text=_('Preserve aspect ratio'),
variable=self.preserve_aspect,
# command=self._updateScale
command=self._updateAutoScale
)
self.aspect_check.grid(row=7, column=0, sticky='ew',
padx=padx, pady=pady)
@ -451,18 +451,24 @@ class SelectCardsetDialogWithPreview(MfxDialog):
elif button == 0:
self.app.menubar.tkopt.auto_scale.set(auto_scale)
self.app.menubar.tkopt.preview_scale.set(
bool(self.preview_scale.get()))
self.app.menubar.tkopt.preserve_aspect_ratio.set(
bool(self.preserve_aspect.get()))
if auto_scale:
self.app.menubar.tkopt.spread_stacks.set(False)
self.scale_values = (self.app.opt.scale_x,
self.app.opt.scale_y,
auto_scale,
bool(self.preview_scale.get()),
False,
bool(self.preserve_aspect.get()))
else:
self.scale_values = (self.scale_x.get(),
self.scale_y.get(),
auto_scale,
self.app.opt.preview_scale,
self.app.opt.spread_stacks,
self.app.opt.
preserve_aspect_ratio)

3
pysollib/tk/menubar.py
View file

@ -110,6 +110,7 @@ class PysolMenubarTk(PysolMenubarTkCommon):
changed = (self.app.opt.scale_x,
self.app.opt.scale_y,
self.app.opt.auto_scale,
self.app.opt.preview_scale,
self.app.opt.spread_stacks,
self.app.opt.preserve_aspect_ratio) != d.scale_values
else:
@ -122,6 +123,8 @@ class PysolMenubarTk(PysolMenubarTkCommon):
(self.app.opt.scale_x,
self.app.opt.scale_y,
self.app.opt.auto_scale,
self.app.opt.preview_scale,
self.app.opt.spread_stacks,
self.app.opt.preserve_aspect_ratio) = d.scale_values
if not self.app.opt.auto_scale:
self.app.images.resize(self.app.opt.scale_x,