Apparently my system here considers fullscreen window as maximized
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 5 Feb 2013 15:52:40 +0000 (15:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 5 Feb 2013 15:52:40 +0000 (15:52 +0000)
which makes it impossible to toggle from fullscreen to windowed mode
when startup.blend is saved in fullscreen mode.

Reshuffled checks a bit, which is actually makes sense, will investigate
which change caused regression since 2.65a tomorrow.

intern/ghost/intern/GHOST_WindowX11.cpp

index 934dec8..7ef3a73 100644 (file)
@@ -935,12 +935,12 @@ GHOST_TWindowState GHOST_WindowX11::getState() const
         */
        if ((state == IconicState) || (state == WithdrawnState))
                state_ret = GHOST_kWindowStateMinimized;
-       else if (netwmIsMaximized() == True)
-               state_ret = GHOST_kWindowStateMaximized;
        else if (netwmIsFullScreen() == True)
                state_ret = GHOST_kWindowStateFullScreen;
        else if (motifIsFullScreen() == True)
                state_ret = GHOST_kWindowStateFullScreen;
+       else if (netwmIsMaximized() == True)
+               state_ret = GHOST_kWindowStateMaximized;
        return (state_ret);
 }