From 9157f8f83384925aee196048a643eeb2cb22be26 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 5 Feb 2013 15:52:40 +0000 Subject: Apparently my system here considers fullscreen window as maximized 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 934dec8e047..7ef3a739b7e 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -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); } -- cgit v1.2.3