fix: Notifications are not rendered topmost

tomlin7 · Jul 13, 2023 · af8676f · af8676f
1 parent a314a40
commit af8676f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/biscuit/app.py b/biscuit/app.py
@@ -92,6 +92,7 @@ def setup_configs(self):
         self.active_directory = None
         self.active_branch_name = None
         self.onupdate_functions = []
+        self.onfocus_functions = []
 
         self.sysinfo = SysInfo(self)
         self.settings = Settings(self)
@@ -232,3 +233,15 @@ def on_gui_update(self, *_):
                 fn()
             except tk.TclError:
                 pass
+
+    def register_onfocus(self, fn):
+        """Registers a function to be called on focus."""
+        self.onfocus_functions.append(fn)
+
+    def on_focus(self, *_):
+        """Calls all registered functions on focus."""
+        for fn in self.onfocus_functions:
+            try:
+                fn()
+            except tk.TclError:
+                pass
diff --git a/biscuit/core/components/floating/notifications/__init__.py b/biscuit/core/components/floating/notifications/__init__.py
@@ -28,6 +28,8 @@ def __init__(self, base):
         close_button.pack(side=tk.RIGHT, fill=tk.BOTH)
 
         self.withdraw()
+
+        self.base.register_onfocus(self.lift)
         self.base.register_onupdate(self._follow_root)
 
     def info(self, text):
@@ -45,12 +47,11 @@ def error(self, text):
         self.label.configure(text=text)
         self.show()
 
-    def _follow_root(self, *_):
+    def _follow_root(self):
         if not self.active:
             return
 
         self.update_idletasks()
-        self.lift()
         x = self.base.winfo_x() + self.base.winfo_width() - self.winfo_width() - self.offset 
         y = self.base.winfo_y() + self.base.winfo_height() - self.winfo_height() - self.offset 
         self.geometry(f"+{x}+{y}")
@@ -59,6 +60,7 @@ def show(self, *_):
         self.active = True
         self._follow_root()
         self.deiconify()
+        self.lift()
 
     def hide(self, *_):
         self.active = False

diff --git a/biscuit/core/utils/binder.py b/biscuit/core/utils/binder.py
@@ -20,7 +20,9 @@ def bind_all(self):
     def late_bind_all(self):
         self.bind(self.bindings.commandpalette, lambda e: self.base.palette.show_prompt(">"))
         self.bind(self.bindings.panel, self.base.root.baseframe.contentpane.toggle_panel)
+
         self.bind('<Configure>', self.base.on_gui_update)
+        self.bind('<FocusIn>', self.base.on_focus)
 
     def bind(self, this, to_this):
         self.base.bind(this, to_this)