#1656: in desktop mode, choose a resolution smaller than the one requ…

…ested when we don't find an exact match git-svn-id: https://xpra.org/svn/Xpra/trunk@17165 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Oct 12, 2017 · 257c9b3 · 257c9b3
1 parent 8d1e506
commit 257c9b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/xpra/x11/desktop_server.py b/src/xpra/x11/desktop_server.py
@@ -355,7 +355,7 @@ def do_resize(self):
         try:
             with xsync:
                 ow, oh = RandR.get_screen_size()
-            w, h = self.set_screen_size(rw, rh)
+            w, h = self.set_screen_size(rw, rh, False)
             if (ow, oh) == (w, h):
                 #this is already the resolution we have,
                 #but the client has other ideas,

diff --git a/src/xpra/x11/x11_server_core.py b/src/xpra/x11/x11_server_core.py
@@ -536,7 +536,7 @@ def do_get_best_screen_size(self, desired_w, desired_h, bigger=True):
         return w, h
 
     def set_screen_size(self, desired_w, desired_h, bigger=True):
-        screenlog("set_screen_size%s", (desired_w, desired_h))
+        screenlog("set_screen_size%s", (desired_w, desired_h, bigger))
         root_w, root_h = self.root_window.get_size()
         if not self.randr:
             return root_w,root_h