[Xfce4-commits] r25712 - xfce4-panel/trunk/panel

[Jasper Huijsmans]

Author: jasper
Date: 2007-05-15 18:01:30 +0000 (Tue, 15 May 2007)
New Revision: 25712

Modified:
   xfce4-panel/trunk/panel/panel-properties.c
Log:
Fix check for valid stut value to also work with differently sized monitors.

Modified: xfce4-panel/trunk/panel/panel-properties.c
===================================================================
--- xfce4-panel/trunk/panel/panel-properties.c	2007-05-13 18:59:34 UTC (rev 25711)
+++ xfce4-panel/trunk/panel/panel-properties.c	2007-05-15 18:01:30 UTC (rev 25712)
@@ -247,6 +247,14 @@
                                        top, bottom, left, right);
 }
 
+/* fairly arbitrary maximum strut size */
+static gboolean
+_validate_strut( gint width,
+                 gint offset )
+{
+    return ( offset < width / 4 );
+}
+
 static void
 _set_struts (Panel       *panel,
              XfceMonitor *xmon,
@@ -284,7 +292,8 @@
             /* no struts possible on Xinerama screens when this monitor
              * has neighbors on the left (see fd.o spec).
              */
-            if (!xmon->has_neighbor_left)
+            if (!xmon->has_neighbor_left 
+                && _validate_strut (xmon->geometry.width, w))
             {
                 data[0] = xmon->geometry.x + w; /* left           */
                 data[4] = y;                    /* left_start_y   */
@@ -296,7 +305,8 @@
             /* no struts possible on Xinerama screens when this monitor
              * has neighbors on the right (see fd.o spec).
              */
-            if (!xmon->has_neighbor_right)
+            if (!xmon->has_neighbor_right 
+                && _validate_strut (xmon->geometry.width, w))
             {
                 data[1] =  gdk_screen_get_width (xmon->screen)
                            - xmon->geometry.x - xmon->geometry.width
@@ -310,7 +320,8 @@
             /* no struts possible on Xinerama screens when this monitor
              * has neighbors on the top (see fd.o spec).
              */
-            if (!xmon->has_neighbor_above)
+            if (!xmon->has_neighbor_above 
+                && _validate_strut (xmon->geometry.height, h))
             {
                 data[2] = xmon->geometry.y
                           + h;          /* top            */
@@ -323,7 +334,8 @@
             /* no struts possible on Xinerama screens when this monitor
              * has neighbors on the bottom (see fd.o spec).
              */
-            if (!xmon->has_neighbor_below)
+            if (!xmon->has_neighbor_below
+                && _validate_strut (xmon->geometry.height, h))
             {
                 data[3] = gdk_screen_get_height (xmon->screen)
                            - xmon->geometry.y - xmon->geometry.height
@@ -342,15 +354,6 @@
          data[4], data[5], data[6], data[7],
          data[8], data[9], data[10], data[11]);
 
-    /* Check for invalid values. */
-    for (i = 0; i < 4; i++)
-    {
-        if (data[i] > MIN(xmon->geometry.width,xmon->geometry.height) / 4)
-        {
-            return;
-        }
-    }
-
     /* Check if values have changed. */
     for (i = 0; i < 12; i++)
     {
@@ -364,17 +367,17 @@
     if (update)
     {
         gdk_error_trap_push ();
-
         gdk_property_change (GTK_WIDGET (panel)->window,
                              gdk_atom_intern ("_NET_WM_STRUT_PARTIAL", FALSE),
                              gdk_atom_intern ("CARDINAL", FALSE), 32,
                              GDK_PROP_MODE_REPLACE, (guchar *) & data, 12);
+        gdk_error_trap_pop ();
 
+        gdk_error_trap_push ();
         gdk_property_change (GTK_WIDGET (panel)->window,
                              gdk_atom_intern ("_NET_WM_STRUT", FALSE),
                              gdk_atom_intern ("CARDINAL", FALSE), 32,
                              GDK_PROP_MODE_REPLACE, (guchar *) & data, 4);
-
         gdk_error_trap_pop ();
     }