[Xfce4-commits] r30233 - in xfwm4/trunk: . src themes/default

Olivier Fourdan olivier at xfce.org
Thu Jul 9 22:24:07 CEST 2009


Author: olivier
Date: 2009-07-09 20:24:06 +0000 (Thu, 09 Jul 2009)
New Revision: 30233

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/cycle.c
   xfwm4/trunk/src/events.c
   xfwm4/trunk/src/moveresize.c
   xfwm4/trunk/themes/default/bottom-active.png
   xfwm4/trunk/themes/default/bottom-active.svg
   xfwm4/trunk/themes/default/bottom-active.xpm
   xfwm4/trunk/themes/default/bottom-inactive.png
   xfwm4/trunk/themes/default/bottom-inactive.svg
   xfwm4/trunk/themes/default/bottom-inactive.xpm
   xfwm4/trunk/themes/default/bottom-left-active.png
   xfwm4/trunk/themes/default/bottom-left-active.svg
   xfwm4/trunk/themes/default/bottom-left-active.xpm
   xfwm4/trunk/themes/default/bottom-left-inactive.png
   xfwm4/trunk/themes/default/bottom-left-inactive.svg
   xfwm4/trunk/themes/default/bottom-left-inactive.xpm
   xfwm4/trunk/themes/default/bottom-right-active.png
   xfwm4/trunk/themes/default/bottom-right-active.svg
   xfwm4/trunk/themes/default/bottom-right-active.xpm
   xfwm4/trunk/themes/default/bottom-right-inactive.png
   xfwm4/trunk/themes/default/bottom-right-inactive.svg
   xfwm4/trunk/themes/default/bottom-right-inactive.xpm
   xfwm4/trunk/themes/default/close-active.png
   xfwm4/trunk/themes/default/close-active.svg
   xfwm4/trunk/themes/default/close-active.xpm
   xfwm4/trunk/themes/default/close-inactive.png
   xfwm4/trunk/themes/default/close-inactive.svg
   xfwm4/trunk/themes/default/close-inactive.xpm
   xfwm4/trunk/themes/default/close-prelight.png
   xfwm4/trunk/themes/default/close-prelight.svg
   xfwm4/trunk/themes/default/close-prelight.xpm
   xfwm4/trunk/themes/default/close-pressed.png
   xfwm4/trunk/themes/default/close-pressed.svg
   xfwm4/trunk/themes/default/close-pressed.xpm
   xfwm4/trunk/themes/default/hide-active.png
   xfwm4/trunk/themes/default/hide-active.svg
   xfwm4/trunk/themes/default/hide-active.xpm
   xfwm4/trunk/themes/default/hide-inactive.png
   xfwm4/trunk/themes/default/hide-inactive.svg
   xfwm4/trunk/themes/default/hide-inactive.xpm
   xfwm4/trunk/themes/default/hide-prelight.png
   xfwm4/trunk/themes/default/hide-prelight.svg
   xfwm4/trunk/themes/default/hide-prelight.xpm
   xfwm4/trunk/themes/default/hide-pressed.png
   xfwm4/trunk/themes/default/hide-pressed.svg
   xfwm4/trunk/themes/default/hide-pressed.xpm
   xfwm4/trunk/themes/default/left-active.png
   xfwm4/trunk/themes/default/left-active.svg
   xfwm4/trunk/themes/default/left-active.xpm
   xfwm4/trunk/themes/default/left-inactive.png
   xfwm4/trunk/themes/default/left-inactive.svg
   xfwm4/trunk/themes/default/left-inactive.xpm
   xfwm4/trunk/themes/default/maximize-active.png
   xfwm4/trunk/themes/default/maximize-active.svg
   xfwm4/trunk/themes/default/maximize-active.xpm
   xfwm4/trunk/themes/default/maximize-inactive.png
   xfwm4/trunk/themes/default/maximize-inactive.svg
   xfwm4/trunk/themes/default/maximize-inactive.xpm
   xfwm4/trunk/themes/default/maximize-prelight.png
   xfwm4/trunk/themes/default/maximize-prelight.svg
   xfwm4/trunk/themes/default/maximize-prelight.xpm
   xfwm4/trunk/themes/default/maximize-pressed.png
   xfwm4/trunk/themes/default/maximize-pressed.svg
   xfwm4/trunk/themes/default/maximize-pressed.xpm
   xfwm4/trunk/themes/default/maximize-toggled-active.png
   xfwm4/trunk/themes/default/maximize-toggled-active.svg
   xfwm4/trunk/themes/default/maximize-toggled-active.xpm
   xfwm4/trunk/themes/default/maximize-toggled-inactive.png
   xfwm4/trunk/themes/default/maximize-toggled-inactive.svg
   xfwm4/trunk/themes/default/maximize-toggled-inactive.xpm
   xfwm4/trunk/themes/default/maximize-toggled-prelight.png
   xfwm4/trunk/themes/default/maximize-toggled-prelight.svg
   xfwm4/trunk/themes/default/maximize-toggled-prelight.xpm
   xfwm4/trunk/themes/default/maximize-toggled-pressed.png
   xfwm4/trunk/themes/default/maximize-toggled-pressed.svg
   xfwm4/trunk/themes/default/maximize-toggled-pressed.xpm
   xfwm4/trunk/themes/default/menu-active.png
   xfwm4/trunk/themes/default/menu-active.svg
   xfwm4/trunk/themes/default/menu-inactive.png
   xfwm4/trunk/themes/default/menu-inactive.svg
   xfwm4/trunk/themes/default/menu-prelight.png
   xfwm4/trunk/themes/default/menu-prelight.svg
   xfwm4/trunk/themes/default/menu-pressed.png
   xfwm4/trunk/themes/default/menu-pressed.svg
   xfwm4/trunk/themes/default/right-active.png
   xfwm4/trunk/themes/default/right-active.svg
   xfwm4/trunk/themes/default/right-active.xpm
   xfwm4/trunk/themes/default/right-inactive.png
   xfwm4/trunk/themes/default/right-inactive.svg
   xfwm4/trunk/themes/default/right-inactive.xpm
   xfwm4/trunk/themes/default/shade-active.png
   xfwm4/trunk/themes/default/shade-active.svg
   xfwm4/trunk/themes/default/shade-active.xpm
   xfwm4/trunk/themes/default/shade-inactive.png
   xfwm4/trunk/themes/default/shade-inactive.svg
   xfwm4/trunk/themes/default/shade-inactive.xpm
   xfwm4/trunk/themes/default/shade-prelight.png
   xfwm4/trunk/themes/default/shade-prelight.svg
   xfwm4/trunk/themes/default/shade-prelight.xpm
   xfwm4/trunk/themes/default/shade-pressed.png
   xfwm4/trunk/themes/default/shade-pressed.svg
   xfwm4/trunk/themes/default/shade-pressed.xpm
   xfwm4/trunk/themes/default/shade-toggled-active.png
   xfwm4/trunk/themes/default/shade-toggled-active.svg
   xfwm4/trunk/themes/default/shade-toggled-active.xpm
   xfwm4/trunk/themes/default/shade-toggled-inactive.png
   xfwm4/trunk/themes/default/shade-toggled-inactive.svg
   xfwm4/trunk/themes/default/shade-toggled-inactive.xpm
   xfwm4/trunk/themes/default/shade-toggled-prelight.png
   xfwm4/trunk/themes/default/shade-toggled-prelight.svg
   xfwm4/trunk/themes/default/shade-toggled-prelight.xpm
   xfwm4/trunk/themes/default/shade-toggled-pressed.png
   xfwm4/trunk/themes/default/shade-toggled-pressed.svg
   xfwm4/trunk/themes/default/shade-toggled-pressed.xpm
   xfwm4/trunk/themes/default/stick-active.png
   xfwm4/trunk/themes/default/stick-active.svg
   xfwm4/trunk/themes/default/stick-active.xpm
   xfwm4/trunk/themes/default/stick-inactive.png
   xfwm4/trunk/themes/default/stick-inactive.svg
   xfwm4/trunk/themes/default/stick-inactive.xpm
   xfwm4/trunk/themes/default/stick-prelight.png
   xfwm4/trunk/themes/default/stick-prelight.svg
   xfwm4/trunk/themes/default/stick-prelight.xpm
   xfwm4/trunk/themes/default/stick-pressed.png
   xfwm4/trunk/themes/default/stick-pressed.svg
   xfwm4/trunk/themes/default/stick-pressed.xpm
   xfwm4/trunk/themes/default/stick-toggled-active.png
   xfwm4/trunk/themes/default/stick-toggled-active.svg
   xfwm4/trunk/themes/default/stick-toggled-active.xpm
   xfwm4/trunk/themes/default/stick-toggled-inactive.png
   xfwm4/trunk/themes/default/stick-toggled-inactive.svg
   xfwm4/trunk/themes/default/stick-toggled-inactive.xpm
   xfwm4/trunk/themes/default/stick-toggled-prelight.png
   xfwm4/trunk/themes/default/stick-toggled-prelight.svg
   xfwm4/trunk/themes/default/stick-toggled-prelight.xpm
   xfwm4/trunk/themes/default/stick-toggled-pressed.png
   xfwm4/trunk/themes/default/stick-toggled-pressed.svg
   xfwm4/trunk/themes/default/stick-toggled-pressed.xpm
   xfwm4/trunk/themes/default/themerc
   xfwm4/trunk/themes/default/title-1-active.png
   xfwm4/trunk/themes/default/title-1-active.svg
   xfwm4/trunk/themes/default/title-1-active.xpm
   xfwm4/trunk/themes/default/title-1-inactive.png
   xfwm4/trunk/themes/default/title-1-inactive.svg
   xfwm4/trunk/themes/default/title-1-inactive.xpm
   xfwm4/trunk/themes/default/title-2-active.png
   xfwm4/trunk/themes/default/title-2-active.svg
   xfwm4/trunk/themes/default/title-2-active.xpm
   xfwm4/trunk/themes/default/title-2-inactive.png
   xfwm4/trunk/themes/default/title-2-inactive.svg
   xfwm4/trunk/themes/default/title-2-inactive.xpm
   xfwm4/trunk/themes/default/title-3-active.png
   xfwm4/trunk/themes/default/title-3-active.svg
   xfwm4/trunk/themes/default/title-3-active.xpm
   xfwm4/trunk/themes/default/title-3-inactive.png
   xfwm4/trunk/themes/default/title-3-inactive.svg
   xfwm4/trunk/themes/default/title-3-inactive.xpm
   xfwm4/trunk/themes/default/title-4-active.png
   xfwm4/trunk/themes/default/title-4-active.svg
   xfwm4/trunk/themes/default/title-4-active.xpm
   xfwm4/trunk/themes/default/title-4-inactive.png
   xfwm4/trunk/themes/default/title-4-inactive.svg
   xfwm4/trunk/themes/default/title-4-inactive.xpm
   xfwm4/trunk/themes/default/title-5-active.png
   xfwm4/trunk/themes/default/title-5-active.svg
   xfwm4/trunk/themes/default/title-5-active.xpm
   xfwm4/trunk/themes/default/title-5-inactive.png
   xfwm4/trunk/themes/default/title-5-inactive.svg
   xfwm4/trunk/themes/default/title-5-inactive.xpm
   xfwm4/trunk/themes/default/top-left-active.png
   xfwm4/trunk/themes/default/top-left-active.svg
   xfwm4/trunk/themes/default/top-left-active.xpm
   xfwm4/trunk/themes/default/top-left-inactive.png
   xfwm4/trunk/themes/default/top-left-inactive.svg
   xfwm4/trunk/themes/default/top-left-inactive.xpm
   xfwm4/trunk/themes/default/top-right-active.png
   xfwm4/trunk/themes/default/top-right-active.svg
   xfwm4/trunk/themes/default/top-right-active.xpm
   xfwm4/trunk/themes/default/top-right-inactive.png
   xfwm4/trunk/themes/default/top-right-inactive.svg
   xfwm4/trunk/themes/default/top-right-inactive.xpm
Log:
	* src/cycle.c, src/events.c, src/client.c: Transition fullscreen
	  windows back to their original layer when another window is 
	  activated (Bug #3551), do not clear the show desktop flag upon 
	  activation of already visible windows,
	* src/moveresize.c: prelinminary support for snap on resize 
	  (patch by Clifford Jolly<cliff at cliffjolly.com>)

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/ChangeLog	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,3 +1,11 @@
+2009-07-09	olivier
+	* src/cycle.c, src/events.c, src/client.c: Transition fullscreen
+	  windows back to their original layer when another window is 
+	  activated (Bug #3551), do not clear the show desktop flag upon 
+	  activation of already visible windows,
+	* src/moveresize.c: prelinminary support for snap on resize 
+	  (patch by Clifford Jolly<cliff at cliffjolly.com>)
+
 2009-06-29	jannis
 
 	* themes/daloa/Makefile.am, themes/default-4.6/Makefile.am,

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/NEWS	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,10 @@
-4.6.2
+4.7.x
 =====
-
+- Transition fullscreen windows back to their original layer 
+  when another window is activated (Bug #3551)
+- Do not clear the show desktop flag upon activation of
+  already visible windows
+- Implement prelinminary support for snap on resize (patch by Clifford Jolly <cliff at cliffjolly.com>)
 - Fix mixed RTL/LTR text not rendering properly in title and tabwin
 
 4.6.1

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/src/client.c	2009-07-09 20:24:06 UTC (rev 30233)
@@ -2548,6 +2548,7 @@
 clientActivate (Client * c, guint32 timestamp)
 {
     ScreenInfo *screen_info;
+    Client *focused;
     Client *sibling;
 
     g_return_if_fail (c != NULL);
@@ -2555,8 +2556,20 @@
 
     screen_info = c->screen_info;
     sibling = clientGetTransientFor(c);
+    focused = clientGetFocus ();
+
     if ((screen_info->current_ws == c->win_workspace) || (screen_info->params->activate_action != ACTIVATE_ACTION_NONE))
     {
+        if ((focused) && (c != focused))
+        {
+            /* We might be able to avoid this if we are about to switch workspace */
+            clientAdjustFullscreenLayer (focused, FALSE);
+        }
+        if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN))
+        {
+            /* We are explicitely activating a window that was shown before show-desktop */
+            clientClearAllShowDesktop (screen_info);
+        }
         if (screen_info->current_ws != c->win_workspace)
         {
             if (screen_info->params->activate_action == ACTIVATE_ACTION_BRING)
@@ -2570,7 +2583,6 @@
         }
         clientRaise (sibling, None);
         clientShow (sibling, TRUE);
-        clientClearAllShowDesktop (screen_info);
         clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
         clientSetLastRaise (c);
     }

Modified: xfwm4/trunk/src/cycle.c
===================================================================
--- xfwm4/trunk/src/cycle.c	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/src/cycle.c	2009-07-09 20:24:06 UTC (rev 30233)
@@ -287,16 +287,20 @@
         workspace = c->win_workspace;
         focused = clientGetFocus ();
 
-        if (workspace != screen_info->current_ws)
+        if ((focused) && (passdata.c != focused))
         {
-            workspaceSwitch (screen_info, workspace, c, FALSE, myDisplayGetCurrentTime (display_info));
+            /* We might be able to avoid this if we are about to switch workspace */
+            clientAdjustFullscreenLayer (focused, FALSE);
         }
-
-        if ((focused) && (passdata.c != focused))
+        if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN))
         {
+            /* We are explicitely activating a window that was shown before show-desktop */
             clientClearAllShowDesktop (screen_info);
-            clientAdjustFullscreenLayer (focused, FALSE);
         }
+        if (workspace != screen_info->current_ws)
+        {
+            workspaceSwitch (screen_info, workspace, c, FALSE, myDisplayGetCurrentTime (display_info));
+        }
 
         sibling = clientGetTransientFor(c);
         clientRaise (sibling, None);

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/src/events.c	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1168,8 +1168,11 @@
             status = EVENT_FILTER_REMOVE;
         }
 
+        if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN))
+        {
+             clientClearAllShowDesktop (screen_info);
+        }
         clientShow (c, TRUE);
-        clientClearAllShowDesktop (screen_info);
 
         if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY) ||
             (c->win_workspace == screen_info->current_ws))
@@ -2490,8 +2493,11 @@
                 clientWithdrawAll (c, c->win_workspace);
                 break;
             case MENU_OP_UNMINIMIZE:
+                if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_WAS_SHOWN))
+                {
+                    clientClearAllShowDesktop (c->screen_info);
+                }
                 clientShow (c, TRUE);
-                clientClearAllShowDesktop (c->screen_info);
                 break;
             case MENU_OP_SHADE:
             case MENU_OP_UNSHADE:

Modified: xfwm4/trunk/src/moveresize.c
===================================================================
--- xfwm4/trunk/src/moveresize.c	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/src/moveresize.c	2009-07-09 20:24:06 UTC (rev 30233)
@@ -364,6 +364,114 @@
     }
 }
 
+gboolean
+clientCheckOverlap (int s1, int e1, int s2, int e2)
+{
+    /* Simple overlap test for an arbitary axis. -Cliff */
+    if ((s1 >= s2 && s1 <= e2) ||
+        (e1 >= s2 && e1 <= e2) ||
+        (s2 >= s1 && s2 <= e1) ||
+        (e2 >= s1 && e2 <= e1))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+int
+clientFindClosestEdgeX (Client *c, int edge_pos)
+{
+    /* Find the closest edge of anything that we can snap to, taking
+       frames into account, or just return the original value if nothing
+       is within the snapping range. -Cliff */
+       
+    Client *c2;
+    ScreenInfo *screen_info;
+    int i, closest;
+    int snap_width;
+
+    screen_info = c->screen_info;
+    snap_width = screen_info->params->snap_width;
+    closest = edge_pos + snap_width + 2; /* This only needs to be out of the snap range to work. -Cliff */
+    
+    for (c2 = screen_info->clients, i = 0; i < screen_info->client_count; c2 = c2->next, i++)
+    {
+        if (FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE)  && (c2 != c) &&
+            (((screen_info->params->snap_to_windows) && (c2->win_layer == c->win_layer))
+             || ((screen_info->params->snap_to_border)
+                  && FLAG_TEST (c2->flags, CLIENT_FLAG_HAS_STRUT)
+                  && FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE))))  
+        {
+        
+            if (clientCheckOverlap (c->y - frameTop (c) - 1, c->y + c->height + frameBottom (c) + 1, c2->y - frameTop (c) - 1, c2->y + c2->height + frameBottom (c) + 1))
+            {
+                if (abs (c2->x - frameLeft (c2) - edge_pos) < abs (closest - edge_pos))
+                {
+                    closest = c2->x - frameLeft (c2);
+                }
+                if (abs ((c2->x + c2->width) + frameRight (c2) - edge_pos) < abs (closest - edge_pos))
+                {
+                    closest = (c2->x + c2->width) + frameRight (c2);
+                }
+            }            
+        }
+    }
+    
+    if (abs (closest - edge_pos) > snap_width)
+    {
+        closest = edge_pos;
+    }
+    
+    return closest;
+}
+
+int
+clientFindClosestEdgeY (Client *c, int edge_pos)
+{
+    /* This function is mostly identical to the one above, but swaps the
+       axes. If there's a better way to do it than this, I'd like to
+       know. -Cliff */
+       
+    Client *c2;
+    ScreenInfo *screen_info;
+    int i, closest;
+    int snap_width;
+
+    screen_info = c->screen_info;
+    snap_width = screen_info->params->snap_width;
+    closest = edge_pos + snap_width + 1; /* This only needs to be out of the snap range to work. -Cliff */
+    
+    for (c2 = screen_info->clients, i = 0; i < screen_info->client_count; c2 = c2->next, i++)
+    {
+        if (FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE)  && (c2 != c) &&
+            (((screen_info->params->snap_to_windows) && (c2->win_layer == c->win_layer))
+             || ((screen_info->params->snap_to_border)
+                  && FLAG_TEST (c2->flags, CLIENT_FLAG_HAS_STRUT)
+                  && FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE))))  
+        {
+
+            if (clientCheckOverlap (c->x - frameLeft (c) - 1, c->x + c->width + frameRight (c) + 1, c2->x - frameLeft (c) - 1, c2->x + c2->width + frameRight (c) + 1))
+            {
+                if (abs (c2->y - frameTop(c2) - edge_pos) < abs (closest - edge_pos))
+                {
+                    closest = c2->y - frameTop (c2);
+                }
+                if (abs ((c2->y + c2->height) + frameBottom (c2) - edge_pos) < abs (closest - edge_pos))
+                {
+                    closest = (c2->y + c2->height) + frameBottom (c2);
+                }
+            }            
+        }
+    }
+    
+    if (abs (closest - edge_pos) > snap_width)
+    {
+        closest = edge_pos;
+    }
+    
+    return closest;
+}
+
 static void
 clientSnapPosition (Client * c, int prev_x, int prev_y)
 {
@@ -1113,6 +1221,8 @@
     int temp;
     gint min_visible;
     gboolean resizing;
+    int right_edge; /* -Cliff */
+    int bottom_edge; /* -Cliff */
 
     TRACE ("entering clientResizeEventFilter");
 
@@ -1300,6 +1410,10 @@
         else if (move_right)
         {
             c->width = passdata->ow + (xevent->xmotion.x_root - passdata->mx);
+
+            /* Attempt to snap the right edge to something. -Cliff */
+            c->width = clientFindClosestEdgeX (c, c->x + c->width + frameRight (c)) - c->x - frameRight (c);
+            
         }
         if (!FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
         {
@@ -1310,6 +1424,9 @@
             else if (move_bottom)
             {
                 c->height = passdata->oh + (xevent->xmotion.y_root - passdata->my);
+                
+                /* Attempt to snap the bottom edge to something. -Cliff */
+                c->height = clientFindClosestEdgeY (c, c->y + c->height + frameBottom (c)) - c->y - frameBottom (c);
             }
         }
         clientConstrainRatio (c, &c->width, &c->height, passdata->handle);
@@ -1318,6 +1435,12 @@
         if (move_left)
         {
             c->x = c->x - (c->width - passdata->oldw);
+            
+            /* Snap the left edge to something. -Cliff */
+            right_edge = c->x + c->width;
+            c->x = clientFindClosestEdgeX (c, c->x - frameLeft (c)) + frameLeft (c);
+            c->width = right_edge - c->x;
+            
             frame_x = frameX (c);
         }
 
@@ -1325,6 +1448,12 @@
         if (!FLAG_TEST (c->flags, CLIENT_FLAG_SHADED) && move_top)
         {
             c->y = c->y - (c->height - passdata->oldh);
+            
+            /* Snap the top edge to something. -Cliff */
+            bottom_edge = c->y + c->height;
+            c->y = clientFindClosestEdgeY (c, c->y - frameTop (c)) + frameTop (c);
+            c->height = bottom_edge - c->y;
+            
             frame_y = frameY (c);
         }
 

Modified: xfwm4/trunk/themes/default/bottom-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -9,19 +9,19 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="6"
+   height="4"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -47,30 +47,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -79,16 +62,16 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0.5,4.5 L 24,4.5"
+       d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0,5.5 L 24,5.5"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,10 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"24 6 3 1",
+"24 4 3 1",
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
 "########################",
 "########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -9,19 +9,19 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
-   height="6"
+   height="4"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -47,30 +47,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -79,16 +62,16 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 0.5,4.5 L 24,4.5"
+       d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0,5.5 L 24,5.5"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,10 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"24 6 3 1",
+"24 4 3 1",
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
 "########################",
 "########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-left-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -14,14 +14,14 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -46,30 +46,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -78,7 +61,7 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5"
+       d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
   <g
@@ -86,8 +69,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#000000;fill-opacity:0.25"
-       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+       style="fill:black;fill-opacity:0.25"
+       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-left-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-left-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@############",
-"@@@@############",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##############",
+"@@##############",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-left-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -14,14 +14,14 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -46,30 +46,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -78,7 +61,7 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5"
+       d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
   <g
@@ -86,8 +69,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#000000;fill-opacity:0.25"
-       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+       style="fill:black;fill-opacity:0.25"
+       d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-left-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@##          ",
-"@@@@############",
-"@@@@############",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##            ",
+"@@##############",
+"@@##############",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-right-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -14,14 +14,14 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -46,30 +46,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -78,7 +61,7 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5"
+       d="M 14.5,0 L 14.5,13.5 C 14.5,14.5 14.5,14.5 13.5,14.5 C 14.5,14.5 0,14.5  0,14.5"
        id="path6061" />
   </g>
   <g
@@ -86,8 +69,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#000000;fill-opacity:0.25"
-       d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+       style="fill:black;fill-opacity:0.25"
+       d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-right-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-right-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"############@@@@",
-"############@@@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"##############@@",
+"##############@@",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-right-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -14,14 +14,14 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -46,30 +46,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -86,8 +69,8 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#000000;fill-opacity:0.25"
-       d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+       style="fill:black;fill-opacity:0.25"
+       d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/bottom-right-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"          ##@@@@",
-"############@@@@",
-"############@@@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"            ##@@",
+"##############@@",
+"##############@@",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};

Modified: xfwm4/trunk/themes/default/close-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-active.svg
===================================================================
--- xfwm4/trunk/themes/default/close-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -194,7 +194,7 @@
      inkscape:label="Button">
     <g
        id="g2328"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
          style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

Modified: xfwm4/trunk/themes/default/close-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/close-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/close-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -194,7 +194,7 @@
      inkscape:label="Button">
     <g
        id="g2328"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"

Modified: xfwm4/trunk/themes/default/close-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/close-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/close-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -208,7 +208,7 @@
      inkscape:label="Button">
     <g
        id="g2328"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
          style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

Modified: xfwm4/trunk/themes/default/close-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/close-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/close-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -208,7 +208,7 @@
      inkscape:label="Button">
     <g
        id="g2328"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
          style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

Modified: xfwm4/trunk/themes/default/close-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/close-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/hide-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-active.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <rect
          style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"

Modified: xfwm4/trunk/themes/default/hide-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/hide-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/hide-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <rect
          style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"

Modified: xfwm4/trunk/themes/default/hide-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/hide-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/hide-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <rect
          style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"

Modified: xfwm4/trunk/themes/default/hide-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/hide-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/hide-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <rect
          style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"

Modified: xfwm4/trunk/themes/default/hide-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/hide-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/hide-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/left-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/left-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -8,20 +8,20 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="6"
+   width="4"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="left-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -45,30 +45,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -83,9 +66,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>

Modified: xfwm4/trunk/themes/default/left-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/left-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/left-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"6 24 3 1",
+"4 24 3 1",
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##"};
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##"};

Modified: xfwm4/trunk/themes/default/left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/left-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/left-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -8,20 +8,20 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="6"
+   width="4"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="left-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -45,30 +45,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -83,9 +66,9 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>

Modified: xfwm4/trunk/themes/default/left-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/left-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/left-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,30 +1,30 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"6 24 3 1",
+"4 24 3 1",
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##",
-"@@@@##"};
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##",
+"@@##"};

Modified: xfwm4/trunk/themes/default/maximize-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-active.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "

Modified: xfwm4/trunk/themes/default/maximize-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "

Modified: xfwm4/trunk/themes/default/maximize-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "

Modified: xfwm4/trunk/themes/default/maximize-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          id="rect2246"
          d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "

Modified: xfwm4/trunk/themes/default/maximize-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "

Modified: xfwm4/trunk/themes/default/maximize-toggled-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1639"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="rect2331"
          d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "

Modified: xfwm4/trunk/themes/default/maximize-toggled-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "

Modified: xfwm4/trunk/themes/default/maximize-toggled-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/maximize-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/maximize-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          id="rect2318"
          d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "

Modified: xfwm4/trunk/themes/default/maximize-toggled-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/maximize-toggled-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/menu-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-active.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/menu-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"

Modified: xfwm4/trunk/themes/default/menu-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/menu-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/menu-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/menu-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"

Modified: xfwm4/trunk/themes/default/menu-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/menu-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/menu-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"

Modified: xfwm4/trunk/themes/default/right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/right-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/right-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -8,20 +8,20 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="6"
+   width="4"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -45,30 +45,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -77,16 +60,16 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 4.5,0 L 4.5,24"
+       d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 5.5,0 L 5.5,24"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/right-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/right-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/right-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"6 24 3 1",
+"4 24 3 1",
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@"};
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@"};

Modified: xfwm4/trunk/themes/default/right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/right-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/right-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -8,20 +8,20 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="6"
+   width="4"
    height="24"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/themes/default"
    sodipodi:docname="right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4" />
+     id="defs7" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="white"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -45,30 +45,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Border</dc:title>
+        <dc:title>Top Corner</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Olivier Fourdan</dc:title>
           </cc:Agent>
         </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -77,16 +60,16 @@
      inkscape:label="hilight">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 4.5,0 L 4.5,24"
+       d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="border">
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 5.5,0 L 5.5,24"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
+       d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/right-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/right-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/right-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,30 +1,30 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"6 24 3 1",
+"4 24 3 1",
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@",
-"##@@@@"};
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@",
+"##@@"};

Modified: xfwm4/trunk/themes/default/shade-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-active.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path2420"
          style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-toggled-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path2420"
          style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-toggled-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-toggled-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/shade-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/shade-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1624"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
          style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"

Modified: xfwm4/trunk/themes/default/shade-toggled-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/shade-toggled-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-active.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-toggled-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -195,7 +195,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-toggled-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-toggled-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="18"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
@@ -205,7 +205,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path2247"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-toggled-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-toggled-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-prelight.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-prelight.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,7)">
+       transform="translate(3,6)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-toggled-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-prelight.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-prelight.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/stick-toggled-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/stick-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-pressed.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-pressed.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="18"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,7 +162,7 @@
     <g
        style="display:inline"
        id="g1969"
-       transform="translate(0,4)">
+       transform="translate(0,3)">
       <path
          style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25;fill-opacity:0.25;opacity:0.5"
          d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
@@ -187,11 +187,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="18"
        height="13"
@@ -209,7 +209,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,8)">
+       transform="translate(3,7)">
       <path
          id="path1412"
          d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "

Modified: xfwm4/trunk/themes/default/stick-toggled-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-pressed.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/stick-toggled-pressed.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,12 +1,11 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 24 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "                  ",
 "                  ",
 "                  ",
-"                  ",
 " ................ ",
 "..................",
 "..................",
@@ -25,5 +24,4 @@
 "..................",
 "..................",
 " ................ ",
-"                  ",
 "                  "};

Modified: xfwm4/trunk/themes/default/themerc
===================================================================
--- xfwm4/trunk/themes/default/themerc	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/themerc	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 active_text_color=#ffffff
-button_offset=-1
-button_spacing=1
+button_offset=2
+button_spacing=0
 full_width_title=false
 maximized_offset=0
 shadow_delta_height=4
@@ -11,5 +11,5 @@
 title_horizontal_offset=1
 title_shadow_active=frame
 title_shadow_inactive=false
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2

Modified: xfwm4/trunk/themes/default/title-1-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-1-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-1-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-1-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="8"
        height="13"

Modified: xfwm4/trunk/themes/default/title-1-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-1-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-1-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-1-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-1-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-1-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-1-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/title-1-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-1-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-1-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-2-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-2-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-2-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-2-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="8"
        height="13"

Modified: xfwm4/trunk/themes/default/title-2-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-2-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-2-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-2-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-2-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-2-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-2-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/title-2-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-2-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-2-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-3-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-3-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-3-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-3-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="8"
        height="13"

Modified: xfwm4/trunk/themes/default/title-3-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-3-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-3-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-3-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-3-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-3-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-3-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/title-3-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-3-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-3-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-4-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-4-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-4-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-4-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="8"
        height="13"

Modified: xfwm4/trunk/themes/default/title-4-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-4-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-4-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-4-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-4-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-4-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-4-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/title-4-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-4-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-4-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-5-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-5-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-5-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-5-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -173,11 +173,11 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3141"
        width="8"
        height="13"

Modified: xfwm4/trunk/themes/default/title-5-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-5-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-5-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_active_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/title-5-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/title-5-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-5-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-5-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -161,7 +161,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="13"
@@ -173,7 +173,7 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect

Modified: xfwm4/trunk/themes/default/title-5-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/title-5-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/title-5-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,6 +1,6 @@
 /* XPM */
 static char * title_inactive_xpm[] = {
-"4 24 2 1",
+"4 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
 "....",
@@ -24,6 +24,4 @@
 "....",
 "....",
 "....",
-"....",
-"....",
 "...."};

Modified: xfwm4/trunk/themes/default/top-left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/top-left-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-left-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -15,7 +15,7 @@
    inkscape:version="0.46"
    sodipodi:version="0.32"
    id="svg2"
-   height="24"
+   height="22"
    width="8"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -152,7 +152,7 @@
      inkscape:label="Border">
     <path
        id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+       d="M 8,0 L 8,1 L 5,1 C 5,1 1,1 1,6 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z"
        style="fill:#000000;fill-opacity:0.25" />
   </g>
   <g
@@ -163,7 +163,7 @@
     <path
        id="path6057"
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,1 L 4,1 C 3,1 1,1 1,3 C 1,7.5 1,11 1,14 L 8,14 L 8,14 L 8,1 z " />
+       d="M 8,1 L 5,1 C 4,1 1,1 1,4 C 1,7.5 1,11 1,14 L 8,14 L 8,14 L 8,1 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -171,15 +171,15 @@
      inkscape:groupmode="layer">
     <path
        id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
+       d="M 8,1 L 5.75,1 C 5.75,1 3,1 3,5 C 3,5 3.75,5 3.75,5 L 8,4 L 8,4 z "
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2,12 L 8,12 L 8,22 L 4,22 L 2,12 z"
        id="path2396" />
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,22 1.5,22 L 1.5,22 L 1.5,25"
        id="path2170" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/top-left-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/top-left-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-left-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,10 +1,11 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 24 2 1",
+"8 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"  ......",
+"   .....",
 " .......",
+" .......",
 "........",
 "........",
 "........",
@@ -23,7 +24,4 @@
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
 "........"};

Modified: xfwm4/trunk/themes/default/top-left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/top-left-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-left-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -15,7 +15,7 @@
    inkscape:version="0.46"
    sodipodi:version="0.32"
    id="svg2"
-   height="24"
+   height="22"
    width="8"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -152,7 +152,7 @@
      inkscape:label="Border">
     <path
        id="rect1319"
-       d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,24 1,24 1,24 L 0,24 L 0,0 L 8,0 z "
+       d="M 8,0 L 8,1 L 5,1 C 5,1 1,1 1,6 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z"
        style="fill:#000000;fill-opacity:0.25" />
   </g>
   <g
@@ -162,8 +162,8 @@
      inkscape:groupmode="layer">
     <path
        id="path6057"
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,1 L 4,1 C 3,1 1,1 1,3 C 1,7.5 1,11 1,14 L 8,14 L 8,14 L 8,1 z " />
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8,1 L 5.75,1 C 5.75,1 3,1 3,5 C 3,5 3.75,5 3.75,5 L 8,4 L 8,4 z " />
   </g>
   <g
      inkscape:label="hilight"
@@ -172,14 +172,14 @@
     <path
        id="path6061"
        d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2,12 L 8,12 L 8,24 L 4,24 L 2,12 z"
+       d="M 2,12 L 8,12 L 8,22 L 4,22 L 2,12 z"
        id="path2396" />
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,25"
+       d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,22 1.5,22 L 1.5,22 L 1.5,25"
        id="path2170" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/top-left-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/top-left-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-left-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,10 +1,11 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 24 2 1",
+"8 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"  ......",
+"   .....",
 " .......",
+" .......",
 "........",
 "........",
 "........",
@@ -23,7 +24,4 @@
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
 "........"};

Modified: xfwm4/trunk/themes/default/top-right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/top-right-active.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-right-active.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -152,7 +152,7 @@
      style="display:inline">
     <path
        id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+       d="M 0,0 L 0,1 L 3,1 C 3,1 7,1 7,6 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z"
        style="fill:#000000;fill-opacity:0.25" />
   </g>
   <g
@@ -162,7 +162,7 @@
      style="display:inline">
     <path
        style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,3 C 7,7.5 7,11 7,14 L 0,14 L 0,14 L 0,1 z "
+       d="M 0,1 L 3,1 C 4,1 7,1 7,4 C 7,7.5 7,11 7,14 L 0,14 L 0,14 L 0,1 z "
        id="path6057" />
   </g>
   <g
@@ -170,16 +170,16 @@
      id="layer3"
      inkscape:groupmode="layer">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+       style="fill:url(#linearGradient6962);fill-opacity:0.15;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 2.25,1 C 2.25,1 5,1 5,5 C 5,5 4.25,5 4.25,5 L 0,4 L 0,4 z "
        id="path6061" />
     <path
-       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+       style="fill:url(#linearGradient3149);fill-opacity:0.05;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6,12 L 0,12 L 0,22 L 4,22 L 6,12 z"
        id="path2396" />
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
-       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,22 6.5,22 L 6.5,22 L 6.5,25"
        id="path2170" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/top-right-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/top-right-active.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-right-active.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,10 +1,11 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 24 2 1",
+"8 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"......  ",
+".....   ",
 "....... ",
+"....... ",
 "........",
 "........",
 "........",
@@ -25,7 +26,4 @@
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
 "........"};

Modified: xfwm4/trunk/themes/default/top-right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/top-right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/top-right-inactive.svg	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-right-inactive.svg	2009-07-09 20:24:06 UTC (rev 30233)
@@ -10,7 +10,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="8"
-   height="24"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -88,7 +88,7 @@
        x1="0"
        y1="13"
        x2="0"
-       y2="24"
+       y2="22"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -152,7 +152,7 @@
      style="display:inline">
     <path
        id="rect1319"
-       d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,24 7,24 7,24 L 8,24 L 8,0 L 0,0 z "
+       d="M 0,0 L 0,1 L 3,1 C 3,1 7,1 7,6 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z"
        style="fill:#000000;fill-opacity:0.25" />
   </g>
   <g
@@ -161,8 +161,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient3148);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,3 C 7,7.5 7,11 7,14 L 0,14 L 0,14 L 0,1 z "
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0,1 L 2.25,1 C 2.25,1 5,1 5,5 C 5,5 4.25,5 4.25,5 L 0,4 L 0,4 z "
        id="path6057" />
   </g>
   <g
@@ -170,16 +170,16 @@
      id="layer3"
      inkscape:groupmode="layer">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.25;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+       style="fill:url(#linearGradient6962);fill-opacity:0.10;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
        id="path6061" />
     <path
        style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6,12 L 0,12 L 0,24 L 4,24 L 6,12 z"
+       d="M 6,12 L 0,12 L 0,22 L 4,22 L 6,12 z"
        id="path2396" />
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
-       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,25"
+       d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,22 6.5,22 L 6.5,22 L 6.5,25"
        id="path2170" />
   </g>
 </svg>

Modified: xfwm4/trunk/themes/default/top-right-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/top-right-inactive.xpm	2009-07-09 16:24:09 UTC (rev 30232)
+++ xfwm4/trunk/themes/default/top-right-inactive.xpm	2009-07-09 20:24:06 UTC (rev 30233)
@@ -1,10 +1,11 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 24 2 1",
+"8 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"......  ",
+".....   ",
 "....... ",
+"....... ",
 "........",
 "........",
 "........",
@@ -23,7 +24,4 @@
 "........",
 "........",
 "........",
-"........",
-"........",
-"........",
 "........"};




More information about the Xfce4-commits mailing list