From f6b5672cf6303b1e484c3e2314dde4f31d00b57a Mon Sep 17 00:00:00 2001
From: lufebe16 <lufebe16@bluewin.ch>
Date: Thu, 4 Jan 2024 14:18:26 +0100
Subject: [PATCH] Kivy/Android - Demo now waits for animation end before next
 step. - Demo command closes menu after selection. - Hint arrow is kept on top
 during demo - Hint arrow fading animation.

---
 pysollib/kivy/menubar.py  |  2 +-
 pysollib/kivy/tkcanvas.py | 14 +++++++++++++-
 pysollib/kivy/tkutil.py   | 14 ++++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py
index 04af31df..2168918c 100644
--- a/pysollib/kivy/menubar.py
+++ b/pysollib/kivy/menubar.py
@@ -523,7 +523,7 @@ class AssistMenuDialog(LMenuDialog):
         #   text='Find Card', command=self.menubar.mFindCard))
 
         tv.add_node(LTreeNode(
-            text=_('Demo'), command=self.menubar.mDemo))
+            text=_('Demo'), command=self.auto_close(self.menubar.mDemo)))
 
         # -------------------------------------------
         # TBD. How ?
diff --git a/pysollib/kivy/tkcanvas.py b/pysollib/kivy/tkcanvas.py
index 927fab0b..4981284a 100644
--- a/pysollib/kivy/tkcanvas.py
+++ b/pysollib/kivy/tkcanvas.py
@@ -476,6 +476,11 @@ class MfxCanvasLine(object):
 
     def delete_deferred(self, seconds):
         # print('MfxCanvasLine: delete_deferred(%s)' % seconds)
+        from kivy.animation import Animation
+        z = 0
+        t = 'in_expo'
+        anim = Animation(opacity=z, t=t, d=seconds/1.5)
+        anim.start(self.line)
         Clock.schedule_once(lambda dt: self.delete(), seconds)
 
     def delete(self):
@@ -783,11 +788,18 @@ class MfxCanvas(LImage):
     def tag_raise(self, itm, abitm=None):
         # print('MfxCanvas: tag_raise, itm=%s, aboveThis=%s' % (itm, abitm))
 
+        def findTop(itm):
+            t = type(itm)
+            for c in self.children:
+                if type(c) is t:
+                    return self.children.index(c)
+            return 0
+
         if (itm is not None):
             if (abitm is None):
                 # print('MfxCanvas: tag_raise: to top')
                 self.remove_widget(itm)
-                self.add_widget(itm)
+                self.add_widget(itm, index=findTop(itm))
             else:
                 # print('MfxCanvas: tag_raise: to specified position')
                 self.remove_widget(itm)
diff --git a/pysollib/kivy/tkutil.py b/pysollib/kivy/tkutil.py
index 5cfcc7d8..0faeeee7 100644
--- a/pysollib/kivy/tkutil.py
+++ b/pysollib/kivy/tkutil.py
@@ -180,12 +180,22 @@ def unbind_destroy(widget):
 # * timer wrapper - Tkinter doesn't properly delete all commands
 # ************************************************************************
 
-
 def after(widget, ms, func, *args):
     # print('tkutil: after(%s, %s, %s, %s)' % (widget, ms, func, args))
     if (ms == 'idle'):
         print('demo use')
-        Clock.schedule_once(lambda dt: func(), 1.0)
+
+        def mkcb(func):
+            def cb():
+                Clock.schedule_once(lambda dt: func(), 0.5)
+            return cb
+
+        from pysollib.kivy.LApp import LAnimationManager
+        if LAnimationManager.checkRunning():
+            # run after animation terminated
+            LAnimationManager.addEndCallback(mkcb(func))
+        else:
+            Clock.schedule_once(lambda dt: func(), 0.5)
     elif (isinstance(ms, int)):
         # print('ms: play timer (accounting)')
         # Clock.schedule_once(lambda dt: func(), float(ms)/1000.0)