Consolidate raiseAll logic into app.py

shlomif · Dec 25, 2024 · 5005ef6 · 5005ef6
1 parent cafdafe
commit 5005ef6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pysollib/actions.py b/pysollib/actions.py
@@ -834,11 +834,6 @@ def mOptTimeouts(self, *args):
             self.app.opt.timeouts['highlight_samerank'] = \
                 d.highlight_samerank_timeout
 
-    def raiseAll(self):
-        raise_find_card_dialog(self.game)
-        raise_full_picture_dialog(self.game)
-        raise_solver_dialog(self.game)
-
     #
     # Help menu
     #

diff --git a/pysollib/app.py b/pysollib/app.py
@@ -516,10 +516,13 @@ def wm_toggle_fullscreen(self):
         self.opt.wm_fullscreen = not self.opt.wm_fullscreen
         self.top.attributes("-fullscreen", self.opt.wm_fullscreen)
         # Topmost dialogs need to be reset when toggling fullscreen.
+        self.raiseAll()
+        self.top.attributes('-topmost', False)
+
+    def raiseAll(self):
         raise_find_card_dialog(self.game)
         raise_full_picture_dialog(self.game)
         raise_solver_dialog(self.game)
-        self.top.attributes('-topmost', False)
 
     def loadImages1(self):
         # load dialog images

diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py
@@ -1893,7 +1893,7 @@ def mOptTopmostDialogs(self, *event):
         if self._cancelDrag(break_pause=False):
             return
         self.app.opt.topmost_dialogs = self.tkopt.topmost_dialogs.get()
-        self.raiseAll()
+        self.app.raiseAll()
 
     def _mOptCardback(self, index):
         if self._cancelDrag(break_pause=False):