From b80bfc4ca68d784473c26c3e0b8222497a767d63 Mon Sep 17 00:00:00 2001 From: Joe R Date: Thu, 26 May 2022 20:07:06 -0400 Subject: [PATCH] Corrected overlapping text in a few games. --- pysollib/games/golf.py | 6 +++--- pysollib/games/sultan.py | 6 +++--- pysollib/games/ultra/hanafuda1.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index d7d81781..1b2a6eea 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -977,11 +977,11 @@ class DevilsSolitaire(Game): x, y = layout.XM+4.5*layout.XS, self.height-layout.YS s.talon = WasteTalonStack(x, y, self, max_rounds=3) - layout.createText(s.talon, 'n') - layout.createRoundText(s.talon, 'nnn') + layout.createText(s.talon, 'se') + layout.createRoundText(s.talon, 'n') x -= layout.XS s.waste = DevilsSolitaire_WasteStack(x, y, self) - layout.createText(s.waste, 'n') + layout.createText(s.waste, 'sw') layout.defaultStackGroups() diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index c7cc0389..2b98c1d9 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -268,11 +268,11 @@ class Contradance(Game): x, y = l.XM+3*l.XS, l.YM+3*l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=2) - l.createText(s.talon, 'n') - l.createRoundText(self.s.talon, 'nnn') + l.createText(s.talon, 'sw') + l.createRoundText(self.s.talon, 'n') x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, 'n') + l.createText(s.waste, 'se') l.defaultStackGroups() diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index 2d1dbcca..146d4222 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -184,7 +184,7 @@ class LesserQueue(AbstractFlowerGame): l.createText(s.talon, "n") s.talon.texts.rounds = MfxCanvasText( self.canvas, - self.width//2, h-2*l.TEXT_MARGIN, + self.width // 2, h - 2.5 * l.TEXT_HEIGHT - l.TEXT_MARGIN, anchor="center", font=self.app.getFont("canvas_default")) x = x + l.XS @@ -208,7 +208,7 @@ class LesserQueue(AbstractFlowerGame): x = x + l.XS self.texts.info = MfxCanvasText( self.canvas, - self.width//2, h-l.TEXT_MARGIN, + self.width // 2, h - l.TEXT_MARGIN - l.TEXT_HEIGHT, anchor="center", font=self.app.getFont("canvas_default"))