diff --git a/pysollib/actions.py b/pysollib/actions.py index 1b9efb22..8ea51a87 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -834,11 +834,6 @@ class PysolMenubar(PysolMenubarTk): 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 index 99db78c2..a1203cc1 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -516,10 +516,13 @@ class Application: 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 index 1cbc0df2..1c0cb4e0 100644 --- a/pysollib/ui/tktile/menubar.py +++ b/pysollib/ui/tktile/menubar.py @@ -1893,7 +1893,7 @@ Unsupported game for import. 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):