Skip to content

Commit

Permalink
#1999: reset the 'last_raised' flag whenever we get an event that may…
Browse files Browse the repository at this point in the history
… cause the window to move down the stack

git-svn-id: https://xpra.org/svn/Xpra/trunk@20892 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 31, 2018
1 parent 1f1f68f commit 2596b14
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/xpra/x11/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ def send_initial_windows(self, ss, sharing=False):


def _new_window_signaled(self, _wm, window):
self.last_raised = None
self._add_new_window(window)

def do_xpra_child_map_event(self, event):
Expand Down Expand Up @@ -702,6 +703,8 @@ def _show_desktop(self, wm, show):

def _focus(self, server_source, wid, modifiers):
focuslog("focus wid=%s has_focus=%s", wid, self._has_focus)
if self.last_raised!=wid:
self.last_raised = None
if self._has_focus==wid:
#nothing to do!
return
Expand Down Expand Up @@ -807,6 +810,8 @@ def _initiate_moveresize(self, window, event):
def _raised_window(self, window, event):
wid = self._window_to_id[window]
windowlog("raised window: %s (%s) wid=%s, current focus=%s", window, event, wid, self._has_focus)
if self.last_raised!=wid:
self.last_raised = None
if self._has_focus==wid:
return
for ss in self._server_sources.values():
Expand Down

0 comments on commit 2596b14

Please sign in to comment.