From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 30 Dec 2021 12:03:46 +0000 (+0100)
Subject: Don't move window in full-screen workaround
X-Git-Tag: v1.12.90~69
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da49141204a3d16c3e670d3a5ecd3d16560efd82;p=tigervnc.git

Don't move window in full-screen workaround

If this is done before the window is shown then it can accidentally
override the window manager's placement of the window. Reducing the size
should be sufficient to avoid trigger a full-screen request.
---

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index cd1da5b5..256d8ff8 100644
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -615,7 +615,6 @@ void DesktopWindow::resize(int x, int y, int w, int h)
         if ((sx == x) && (sy == y) && (sw == w) && (sh == h)) {
           vlog.info(_("Adjusting window size to avoid accidental full-screen request"));
           // Assume a panel of some form and adjust the height
-          y += 20;
           h -= 40;
         }
       }