summaryrefslogtreecommitdiffstats
path: root/vncviewer
diff options
context:
space:
mode:
authorPeter Åstrand (astrand) <astrand@cendio.se>2018-04-18 21:49:41 +0200
committerPeter Åstrand (astrand) <astrand@cendio.se>2018-05-02 15:51:34 +0200
commita890572b8d4593143c7e6dc1dd9e776df18feb6e (patch)
treed581606906eb1f0251f72e14f74a35930f72d70f /vncviewer
parent105177fc07d07521eafdcf373c1825a59b9c554d (diff)
downloadtigervnc-a890572b8d4593143c7e6dc1dd9e776df18feb6e.tar.gz
tigervnc-a890572b8d4593143c7e6dc1dd9e776df18feb6e.zip
Update fullscreen window if changing fullScreenAllMonitors option
Diffstat (limited to 'vncviewer')
-rw-r--r--vncviewer/DesktopWindow.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index b36f92bf..e86e90e6 100644
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -762,7 +762,8 @@ void DesktopWindow::fullscreen_on()
fullscreen_screens(top, bottom, left, right);
}
- fullscreen();
+ if (!fullscreen_active())
+ fullscreen();
}
void DesktopWindow::grabKeyboard()
@@ -1186,7 +1187,9 @@ void DesktopWindow::handleOptions(void *data)
else
self->ungrabKeyboard();
- if (fullScreen && !self->fullscreen_active())
+ // Call fullscreen_on even if active since it handles
+ // fullScreenAllMonitors
+ if (fullScreen)
self->fullscreen_on();
else if (!fullScreen && self->fullscreen_active())
self->fullscreen_off();