only use synthetic unfocus events when needed

Xpra-org · May 21, 2023 · 608b600 · 608b600
1 parent e2dfae9
commit 608b600
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/xpra/client/gtk_base/gtk_client_window_base.py b/xpra/client/gtk_base/gtk_client_window_base.py
@@ -2014,7 +2014,8 @@ def destroy(self):      #pylint: disable=method-hidden
         self.on_realize_cb = {}
         ClientWindowBase.destroy(self)
         gtk.Window.destroy(self)
-        self._unfocus()
+        if self._client.has_focus(self._id):
+            self._unfocus()
         self.destroy = self.noop_destroy
 
 

diff --git a/xpra/client/mixins/window_manager.py b/xpra/client/mixins/window_manager.py
@@ -1244,6 +1244,9 @@ def send_focus(self, wid):
         focuslog("send_focus(%s)", wid)
         self.send("focus", wid, self.get_current_modifiers())
 
+    def has_focus(self, wid):
+        return self._focused and self._focused==wid
+
     def update_focus(self, wid, gotit):
         focuslog("update_focus(%s, %s) focused=%s, grabbed=%s", wid, gotit, self._focused, self._window_with_grab)
         if gotit: