[Xfce4-commits] r29688 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-28 17:37:56 +0000 (Sat, 28 Mar 2009)
New Revision: 29688

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/netwm.c
Log:
	* src/netwm.c: Keep window layer when status is above, below or 
	  fullscreen (Bug #5030)

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-03-28 15:06:37 UTC (rev 29687)
+++ xfwm4/trunk/ChangeLog	2009-03-28 17:37:56 UTC (rev 29688)
@@ -1,3 +1,8 @@
+2009-03-28	olivier
+
+	* src/netwm.c: Keep window layer when status is above, below or 
+	  fullscreen (Bug #5030)
+
 2009-03-26	olivier
 
 	* src/placement.c: Do not not fill over adjacent windows (Bug #5152)

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-03-28 15:06:37 UTC (rev 29687)
+++ xfwm4/trunk/NEWS	2009-03-28 17:37:56 UTC (rev 29688)
@@ -11,6 +11,8 @@
 - Fix a long standing bug in xfwm4 4.6 were activating a transient would not
   regrab the mouse on parent window.
 - Do not go over adjacent windows with fill (Bug #5152)
+- Do not actually change window layer when status is above, below or fullscreen
+  (Bug #5030)
 
 4.6.0
 =====

Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c	2009-03-28 15:06:37 UTC (rev 29687)
+++ xfwm4/trunk/src/netwm.c	2009-03-28 17:37:56 UTC (rev 29688)
@@ -1309,11 +1309,14 @@
         }
         FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_HIDE);
     }
-    if ((old_type != c->type) || (c->initial_layer != c->win_layer))
+    if (!FLAG_TEST (c->flags, CLIENT_FLAG_ABOVE|CLIENT_FLAG_BELOW|CLIENT_FLAG_FULLSCREEN))
     {
-        TRACE ("setting layer %i", c->initial_layer);
-        clientSetLayer (c, c->initial_layer);
-        clientSetNetState (c);
+        if ((old_type != c->type) || (c->initial_layer != c->win_layer))
+        {
+            TRACE ("setting layer %i", c->initial_layer);
+            clientSetLayer (c, c->initial_layer);
+            clientSetNetState (c);
+        }
     }
 }
 
@@ -1468,7 +1471,7 @@
     if (getNetWMUserTime (display_info, c->user_time_win, &c->user_time))
     {
         guint32 last_user_time;
-        
+
         last_user_time = myDisplayGetLastUserTime (display_info);
         if (c->user_time && TIMESTAMP_IS_BEFORE(last_user_time, c->user_time))
         {