Allow auto scaling and spread stacks to be used together

Author: joeraz

pysollib/app.py

@@ -984,7 +984,6 @@ def selectCardset(self, title, key):
         if USE_PIL:
             if (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 or \
                     (cs.CARD_XOFFSET, cs.CARD_YOFFSET) != d.cardset_values:
@@ -996,7 +995,6 @@ def selectCardset(self, title, key):
              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:
                 self.images.resize(self.opt.scale_x, self.opt.scale_y,

pysollib/game/__init__.py

@@ -1053,21 +1053,32 @@ def resizeImages(self, manually=False):
             # calculate factor of resizing
             xf = float(vw)/iw
             yf = float(vh)/ih
-            if (self.app.opt.preserve_aspect_ratio
-                    and not self.app.opt.spread_stacks):
-                xf = yf = min(xf, yf)
+            if self.app.opt.preserve_aspect_ratio:
+                if self.app.opt.spread_stacks:
+                    # layout uses full xf, yf; images use uniform scale
+                    xf_img, yf_img = min(xf, yf), min(xf, yf)
+                else:
+                    xf = yf = min(xf, yf)
+                    xf_img, yf_img = xf, yf
+            else:
+                xf_img, yf_img = xf, yf
         else:
             xf, yf = self.app.opt.scale_x, self.app.opt.scale_y
+            xf_img, yf_img = xf, yf
+
         if (not self.app.opt.center_layout or self.app.opt.spread_stacks or
                 (self.app.opt.auto_scale and not
                  self.app.opt.preserve_aspect_ratio)):
             self.center_offset = 0, 0
         else:
             self.center_offset = self.app.images.getCenterOffset(
                 vw, vh, iw, ih, xf, yf, self.app.opt.auto_scale)
-        if (not self.app.opt.spread_stacks or manually):
+
+        if (not self.app.opt.spread_stacks or self.app.opt.auto_scale
+                or manually):
             # images
-            self.app.images.resize(xf, yf, resample=self.app.opt.resampling)
+            self.app.images.resize(xf_img, yf_img,
+                                   resample=self.app.opt.resampling)
         # cards
         for card in self.cards:
             card.update(card.id, card.deck, card.suit, card.rank, self)

pysollib/tile/selectcardset.py

@@ -464,19 +464,16 @@ def mDone(self, button):
                         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)
         if button == 10:                # Info

pysollib/tk/menubar.py

@@ -111,7 +111,6 @@ def mSelectCardsetDialog(self, *event):
                        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:
             changed = False
@@ -124,7 +123,6 @@ def mSelectCardsetDialog(self, *event):
                  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,

pysollib/ui/tktile/menubar.py

@@ -1882,11 +1882,6 @@ def mOptAutoScale(self, *event):
             return
         auto_scale = not self.app.opt.auto_scale
 
-        # In the future, it should be possible to use both options together,
-        # but the current logic conflicts, so not allowed for now.
-        self.app.opt.spread_stacks = False
-        self.tkopt.spread_stacks.set(False)
-
         self.app.opt.auto_scale = auto_scale
         self.tkopt.auto_scale.set(auto_scale)
         self._updateCardSize()
@@ -1922,11 +1917,6 @@ def mOptSpreadStacks(self, *event):
             return
         spread_stacks = not self.app.opt.spread_stacks
 
-        # In the future, it should be possible to use both options together,
-        # but the current logic conflicts, so not allowed for now.
-        self.app.opt.auto_scale = False
-        self.tkopt.auto_scale.set(False)
-
         self.app.opt.spread_stacks = spread_stacks
         self.tkopt.spread_stacks.set(spread_stacks)
         self._updateCardSize()