Skip to content

Commit

Permalink
desktop geometry attributes are not meant to be synced for desktop se…
Browse files Browse the repository at this point in the history
…rvers: group them in a utility method, override this method with a noop for desktop servers

git-svn-id: https://xpra.org/svn/Xpra/trunk@13672 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 12, 2016
1 parent abd1d82 commit 4c4e31b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/xpra/server/server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1206,10 +1206,13 @@ def do_parse_screen_info(self, ss):
maxw, maxh = self.get_max_screen_size()
w = min(w, maxw)
h = min(h, maxh)
self.set_desktop_geometry_attributes(w, h)
return w, h

def set_desktop_geometry_attributes(self, w, h):
self.calculate_desktops()
self.calculate_workarea(w, h)
self.set_desktop_geometry(w, h)
return w, h

def parse_hello_ui_clipboard(self, ss, c):
#take the clipboard if no-one else has it yet:
Expand Down Expand Up @@ -2141,7 +2144,7 @@ def _screen_size_changed(self, screen):
#randr has resized the screen, tell the client (if it supports it)
w, h = screen.get_width(), screen.get_height()
screenlog("new screen dimensions: %ix%i", w, h)
self.calculate_workarea(w, h)
self.set_desktop_geometry_attributes(w, h)
self.idle_add(self.send_updated_screen_size)

def get_root_window_size(self):
Expand Down
5 changes: 5 additions & 0 deletions src/xpra/x11/desktop_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ def print_screen_info(self):
log_screen_sizes(root_w, root_h, sss)


def set_desktop_geometry_attributes(self, w, h):
#geometry is not synced with the client's for desktop servers
pass


def get_server_mode(self):
return "X11 desktop"

Expand Down

0 comments on commit 4c4e31b

Please sign in to comment.