From 52e2ffc58fe97463ad9663526a32e7880fe1d771 Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Sat, 1 Mar 2025 16:17:53 -0500
Subject: [PATCH] Add two mahjongg layouts

---
 pysollib/gamedb.py                   |  4 +--
 pysollib/games/mahjongg/mahjongg.py  |  2 +-
 pysollib/games/mahjongg/mahjongg3.py | 44 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index f76b1092..0af79e36 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -594,8 +594,8 @@ class GI:
          tuple(range(19000, 19012)) + tuple(range(22303, 22311)) +
          tuple(range(22353, 22361))),
         ('fc-3.1', tuple(range(961, 971))),
-        ('dev', tuple(range(971, 978)) + tuple(range(18005, 18007)) +
-         (44, 526,)),
+        ('dev', tuple(range(971, 978)) + tuple(range(5419, 5421)) +
+         tuple(range(18005, 18007)) + (44, 526,)),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py
index 11d025a9..e50758a3 100644
--- a/pysollib/games/mahjongg/mahjongg.py
+++ b/pysollib/games/mahjongg/mahjongg.py
@@ -407,7 +407,7 @@ class AbstractMahjonggGame(Game):
 
         # width of self.texts.info
         # ti_width = Font(self.canvas, font).measure(_('Remaining'))
-        ti_width = 80
+        ti_width = max(80, l.CW)
 
         # set window size
         dxx, dyy = abs(dx) * (max_tl+1), abs(dy) * (max_tl+1)
diff --git a/pysollib/games/mahjongg/mahjongg3.py b/pysollib/games/mahjongg/mahjongg3.py
index 82e2de29..90d86c70 100644
--- a/pysollib/games/mahjongg/mahjongg3.py
+++ b/pysollib/games/mahjongg/mahjongg3.py
@@ -356,6 +356,50 @@ r(5418, "Zigzag", layout="0aabaajaaracahcb" +
     "ynvyniyoaypaAehA" +
     "faAgaAmhAnaAoaCa" +
     "aCfaCnaCs")
+r(5419, "Lizard", layout="0aadaafaahaajhbe" +
+    "hbghbibccaceacga" +
+    "ciackidjbebaejae" +
+    "laeqheraesifkbga" +
+    "agehgfaggagkagmb" +
+    "grihlaiabifailai" +
+    "nbirijmojqakaakg" +
+    "hkhakiokihkjakko" +
+    "kkvklakmvknakook" +
+    "ohkpakqhllolmhln" +
+    "amaamkammamohnlo" +
+    "nmhnnaokaomaoohp" +
+    "lopmhpnaqjaqlaqn" +
+    "hrkorlhrmasjasla" +
+    "snhtkotlhtmaujau" +
+    "launhvkovlhvmawi" +
+    "awkawmhxjpxkhxla" +
+    "yiaykaymazehzfaz" +
+    "gozghzhozihzjvzj" +
+    "ozkhzlvzlozmhzna" +
+    "zoozohzpazqaAiaA" +
+    "kaAmbBdiBkbBraCj" +
+    "aClaDchDdaDehDka" +
+    "DqhDraDsaEjaElaF" +
+    "daFraGk")
+r(5420, "Candy", layout="0daadaccaebagbai" +
+    "aakdcbccdbcfbcha" +
+    "cjcecbeebegaeibg" +
+    "dbgfaghbieaigakd" +
+    "akfakhhlfambamda" +
+    "mfamhamjhnchneon" +
+    "fhnghniaobaodaof" +
+    "aohaojhpcipeipgh" +
+    "piaqbaqdaqfvqfaq" +
+    "haqjhrcireirghri" +
+    "asbasdasfashasjh" +
+    "tchteotfhtghtiau" +
+    "baudaufauhaujhvf" +
+    "awdawfawhayebyga" +
+    "AdbAfbAhaCcbCebC" +
+    "gcCiaEbbEdbEfcEh" +
+    "dEjaGabGcbGecGgd" +
+    "GidGk")
+
 
 # ----------------------------------------------------------------------