[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54334] trunk/blender/intern/ghost/intern/ GHOST_WindowX11.cpp: Apparently my system here considers fullscreen window as maximized

[Sergey Sharybin]

Revision: 54334
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54334
Author:   nazgul
Date:     2013-02-05 15:52:40 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-02-05 15:30:00 UTC (rev 54333)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-02-05 15:52:40 UTC (rev 54334)
@@ -935,12 +935,12 @@
 	 */
 	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);
 }