diff options
| author | Peter Åstrand <astrand@cendio.se> | 2011-08-02 08:33:27 +0000 |
|---|---|---|
| committer | Peter Åstrand <astrand@cendio.se> | 2011-08-02 08:33:27 +0000 |
| commit | d62482e0130522ce4cdbe6c7e54242b07352047e (patch) | |
| tree | e93c45b586677b26111fcf6f8f880e83b829a493 | |
| parent | cebb1ce44f31d541de5568264651ada3f9049299 (diff) | |
| download | tigervnc-d62482e0130522ce4cdbe6c7e54242b07352047e.tar.gz tigervnc-d62482e0130522ce4cdbe6c7e54242b07352047e.zip | |
Another fullscreen fix: avoid triggering fullscreen simply by setting
the window size to the size of the screen.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4612 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | vncviewer/DesktopWindow.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx index a7373ffc..6ff631c7 100644 --- a/vncviewer/DesktopWindow.cxx +++ b/vncviewer/DesktopWindow.cxx @@ -76,8 +76,16 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, // See comment in DesktopWindow::handleOptions size_range(100, 100, 0, 0); fullscreen(); - } + } else #endif + { + // If we are creating a window which is equal to the size on the + // screen on X11, many WMs will treat this as a legacy fullscreen + // request. This is not what we want. Besides, it doesn't really + // make sense to try to create a window which is larger than the + // available work space. + size(__rfbmin(w, Fl::w()), __rfbmin(h, Fl::h())); + } show(); |