anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Make auto_scale spread non-talon stacks on canvas

Browse source 
make card size, scale and canvas changes independent
check scale x after change cardset
This commit is contained in:
Guillaumegaillard 2020-11-18 16:18:37 +01:00 • committed by Shlomi Fish
parent 93793c01db
commit 5876134d11
3 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pysollib/game/__init__.py
View file

@ -982,9 +982,9 @@ class Game(object):
self.endGame(restart=1)
self.newGame(restart=1, random=self.random)
def resizeImages(self):
def resizeImages(self, manually=False):
# resizing images and cards
if self.app.opt.auto_scale:
if self.app.opt.auto_scale and not manually:
if self.canvas.winfo_ismapped():
# apparent size of canvas
vw = self.canvas.winfo_width()
@ -1006,24 +1006,40 @@ class Game(object):
xf = yf = min(xf, yf)
else:
xf, yf = self.app.opt.scale_x, self.app.opt.scale_y
# images
self.app.images.resize(xf, yf)
# images
self.app.images.resize(xf, yf)
# cards
for card in self.cards:
card.update(card.id, card.deck, card.suit, card.rank, self)
return xf, yf
return xf, yf, self.app.images._xfactor, self.app.images._yfactor
def resizeGame(self):
def resizeGame(self, card_size_manually=False):
# if self.busy:
# return
if not USE_PIL:
return
self.deleteStackDesc()
xf, yf = self.resizeImages()
xf, yf, xf0, yf0 = self.resizeImages(manually=card_size_manually)
for stack in self.allstacks:
x0, y0 = stack.init_coord
x, y = int(round(x0*xf)), int(round(y0*yf))
stack.resize(xf, yf)
# Do not move Talons
# (because one would need to reposition
# 'empty cross' and 'redeal' figures)
# But in that case,
# games with talon not placed top-left corner
# will get it misplaced when auto_scale
# e.g. Suit Elevens
# => player can fix that issue by setting auto_scale false
if stack is self.s.talon:
# stack.init_coord=(x, y)
if card_size_manually:
stack.resize(xf, yf0)
else:
stack.resize(xf0, yf0)
else:
stack.resize(xf, yf0)
stack.updatePositions()
self.regions.calc_info(xf, yf)
# texts

20
pysollib/tile/selectcardset.py
View file

@ -358,22 +358,24 @@ class SelectCardsetDialogWithPreview(MfxDialog):
if USE_PIL:
auto_scale = bool(self.auto_scale.get())
if button == 1:
self.app.menubar.tkopt.auto_scale.set(auto_scale)
if button == 1: # Cancel
# no changes
self.cardset_values = None
elif button == 0: # OK
self.app.menubar.tkopt.auto_scale.set(auto_scale)
self.app.opt.scale_x = self.scale_x.get()
self.app.opt.scale_y = self.scale_y.get()
self.app.opt.preserve_aspect_ratio = \
self.preserve_aspect.get()
if auto_scale:
self.scale_values = (self.app.opt.scale_x,
self.app.opt.scale_y,
auto_scale,
bool(self.preserve_aspect.get()))
else:
self.scale_values = (self.scale_x.get(),
self.scale_y.get(),
auto_scale,
self.app.opt.preserve_aspect_ratio)
self.app.game.resizeGame(card_size_manually=True)
self.app.game.resizeGame(card_size_manually=False)
if button == 10: # Info
cs = self.manager.get(self.tree.selection_key)
if not cs:

12
pysollib/ui/tktile/menubar.py
View file

@ -1439,10 +1439,12 @@ Unsupported game for import.
geom = (self.app.canvas.winfo_width(),
self.app.canvas.winfo_height())
self.app.opt.game_geometry = geom
self.app.game.resizeGame()
self.app.game.resizeGame(card_size_manually=True)
if self.app.opt.auto_scale:
w, h = self.app.opt.game_geometry
self.app.canvas.setInitialSize(w, h, scrollregion=False)
# Resize a second time to auto scale
self.app.game.resizeGame(card_size_manually=False)
else:
w = int(round(self.app.game.width * self.app.opt.scale_x))
h = int(round(self.app.game.height * self.app.opt.scale_y))
@ -1461,8 +1463,8 @@ Unsupported game for import.
self.app.opt.scale_y += 0.1
else:
return
self.app.opt.auto_scale = False
self.tkopt.auto_scale.set(False)
# self.app.opt.auto_scale = False
# self.tkopt.auto_scale.set(False)
self._updateCardSize()
def mDecreaseCardset(self, *event):
@ -1476,8 +1478,8 @@ Unsupported game for import.
self.app.opt.scale_y -= 0.1
else:
return
self.app.opt.auto_scale = False
self.tkopt.auto_scale.set(False)
# self.app.opt.auto_scale = False
# self.tkopt.auto_scale.set(False)
self._updateCardSize()
def mOptAutoScale(self, *event):