From 289df06b95b3870486aad61b10595f02cbe4c864 Mon Sep 17 00:00:00 2001
From: lufebe16 <lufebe16@bluewin.ch>
Date: Wed, 27 Nov 2024 09:30:03 +0100
Subject: [PATCH] Kivy/Android: - zoom: card selection improved (bug fix)

---
 locale/pl/LC_MESSAGES/pysol.mo    | Bin 82939 -> 82939 bytes
 locale/pt_BR/LC_MESSAGES/pysol.mo | Bin 70192 -> 70192 bytes
 pysollib/kivy/LObjWrap.py         |   2 +-
 pysollib/kivy/tkwidget.py         |  12 +++++++++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/locale/pl/LC_MESSAGES/pysol.mo b/locale/pl/LC_MESSAGES/pysol.mo
index 8e445a03cab50121af55b8343270c41673596079..3c3f7686449d493a9b2556397f2a46fae2a59309 100644
GIT binary patch
delta 117
zcmey}&icEZbwf@hlL*V?yvS)xOIS9uMWwMYC9`hMi%Vl-de5@?T0$K&69dEKu#_mK
zc$UqZQq&lk4l-@Nm3ohr=`-`>UD<6+2beZH<xFD(sk&8k3`lKWRBWQhU7T5!%HWxt
VpQli~`QbulLB^!bPdAB81OSYyDn<YR

delta 117
zcmey}&icEZbwf@h(`V+%d6CnY7#KFQMWwNT=)AZzCZ+>So3AC*F*ChqnH-i9#gxpt
zc~goSBhwO=&9_qTu>zG%-j&_P6wk8RDQ6lR(?O=mw~CH2iLh*5RBWQh9h_N}%HWxt
VpQjMK`QbulK}M&|PdAB81OSW)DdqqG

diff --git a/locale/pt_BR/LC_MESSAGES/pysol.mo b/locale/pt_BR/LC_MESSAGES/pysol.mo
index f9dd965f708c84351ec8289a4bebbf58439b4ddb..2297e4d01b728e8d7439a9fb89481900cd11fefd 100644
GIT binary patch
delta 60
zcmdn6gk=K|EpTIEVA#CK?HC8sHm1#4{y~h4TQ=_vNM>ca&OBKu%#HEl=FG5SBgUl7
OcROlgfK=4eYdQeBw-?9&

delta 60
zcmdn6gk=K|EpTJn#<Y2n+c6HNEzFy<{DT-7FK*r&kj%=&z%W@U%#HE-=FG5SBSxpq
OcROlgfK=4eYdQeQaTkaH

diff --git a/pysollib/kivy/LObjWrap.py b/pysollib/kivy/LObjWrap.py
index b43d4dcea..326ee3607 100644
--- a/pysollib/kivy/LObjWrap.py
+++ b/pysollib/kivy/LObjWrap.py
@@ -40,7 +40,7 @@ def __init__(self,obj,ref=None,command=None):
             self.bind(value=command)
 
     def on_value(self,inst,val):
-        logging.info("LObjWrap: %s = %s" % (self.ref,val))
+        # logging.info("LObjWrap: %s = %s" % (self.ref,val))
         if self.ref is not None:
             setattr(self.obj,self.ref,val)
 
diff --git a/pysollib/kivy/tkwidget.py b/pysollib/kivy/tkwidget.py
index cecc33c2c..68c07a304 100644
--- a/pysollib/kivy/tkwidget.py
+++ b/pysollib/kivy/tkwidget.py
@@ -387,6 +387,7 @@ def __init__(self, inner, **kw):
         self.scale_min = 1.0
         self.scale_max = 2.2
         self.lock_pos = None
+        self.lock_chk = None
         self.offset = None
         self.tkopt = None
 
@@ -420,8 +421,10 @@ def _update(self):
                 dx = round(self.offset[0] * (self.bbox[1][0] - self.size[0]))
                 dy = round(self.offset[1] * (self.bbox[1][1] - self.size[1]))
                 self.pos = (self.parent.pos[0]-dx,self.parent.pos[1]-dy)
+                if self.lock_chk is None:
+                    Clock.schedule_once(lambda dt: self.chk_bnd()) # noqa
             self.lock_pos = None
-            print("_update",self.pos,self.size)
+            # print("_update",self.pos,self.size)
 
     def _updatesize(self,instance,value):
         self.inner.size = self.size
@@ -466,6 +469,10 @@ def on_transform_with_touch(self,touch):
     def chk_bnd(self):
         # Keep the game on the screen.
 
+        # check and set lock
+        if self.lock_chk is not None: return
+        self.lock_chk = "locked"
+
         # limiting parameters:
         pos,size = self.bbox
         w,h = size
@@ -502,6 +509,9 @@ def chk_bnd(self):
             zoominfo = [zoom, 0.0, 0.0]
         self.tkopt.table_zoom.value = zoominfo
 
+        # remove lock
+        self.lock_chk = None
+
 
 class LScrollFrame(BoxLayout,StencilView):
     def __init__(self, **kw):