Merge lp:~albyrock87/awn/awn-lucido into lp:awn/0.4

[Alberto Aldegheri]

Thank's to mhr3's idea: "use separators tho style Lucido"

A video to explain all features [OLD]:
http://www.youtube.com/watch?v=5PD9WFDPcmk

New version:
http://www.youtube.com/watch?v=8EFIILJJufo

[Michal Hruby (mhr3)]

Ok, there'll be many points here, but here we go:

1) Please add curly brackets to all ifs (& elses) per code guidelines (the one-liners).
2) awn_background_lucido_redraw - please add variables for AwnBackgroundLucidoPrivate and AwnBackground, everything caps looks just strange...
3) _init_positions - remove 239-240 - it's init, so the assumption that you need to free something is wrong (otherwise it's not really init)
4) 315: starting a timer in init method is suspicious, ideally it should be started only once you know that you need to animate.
5) 1082: shouldn't the value be 10?
6) 1224: What's the 10000?
7) I still don't like the "transparent" property, I suggest connecting to expose event instead of setting this property, since you mentioned you don't want to add panel-style switch in Separator's expose.
8) Revert 1436 & 1442.

review: Needs Fixing (code-review)

[Michal Hruby (mhr3)]

Oh, and 1477 is unnecessary.

[Alberto Aldegheri (albyrock87)]

> Ok, there'll be many points here, but here we go:
>
> 1) Please add curly brackets to all ifs (& elses) per code guidelines (the
> one-liners).
> 2) awn_background_lucido_redraw - please add variables for
> AwnBackgroundLucidoPrivate and AwnBackground, everything caps looks just
> strange...
Ok..

> 3) _init_positions - remove 239-240 - it's init, so the assumption that you
> need to free something is wrong (otherwise it's not really init)
> 4) 315: starting a timer in init method is suspicious, ideally it should be
> started only once you know that you need to animate.
You're right..

> 5) 1082: shouldn't the value be 10?
Not in that case: if the first applet is a separator, that separator acts like a "background changer". If you put a separator in first position, the curve starts from bottom, otherwise from top.
> 6) 1224: What's the 10000?
It can be changed to : if (expand) w = -w; it's just for give "expand" a great importance in the "w" calculation.

> 7) I still don't like the "transparent" property, I suggest connecting to
> expose event instead of setting this property, since you mentioned you don't
> want to add panel-style switch in Separator's expose.
I mentioned I do want to add style switches to Separator :)
So.. what to do now?

> 8) Revert 1436 & 1442.
Ok

[Michal Hruby (mhr3)]

> I mentioned I do want to add style switches to Separator :)
> So.. what to do now?

Add panel-style property to Separators and have AppletManager update it.

review: Needs Fixing

[Alberto Aldegheri (albyrock87)]

Lucido in lp:awn needs to be improved with separator version.
Animation (for now) remains in my dreams.
Feel free to fork rev 721 and try to fix it as you wish :)

[Alberto Aldegheri (albyrock87)]

>> Add panel-style property to Separators and have AppletManager update it.
My answer is no, for the following reasons:

- Lucido, needs to set the aspect of each single separator,
  because (for example) if there is a separator in the first position,
  that separator needs to be 1 pixel (non-visible-like).
  But if we talk generally, Curve Style, needs to set the height of each separator
  depending on the position of the separator in the background.
- When some config-values change, separator needs to change too.
  For real 3d effect (in 3d style - 3d angle property) separator needs to be inclined
  based on the position an height of the bar.
  But for example, in Lucido, speparator needs to change when corner radius changes.

So, if we have Applet Manager update each separator, it means that Applet Manager knows exactly how to do that-> it means code duplication, and extra listener, for what? To move a "loop on separators" and bg specifications into AppletManager?
Don't take it personally, but for me that has no sense.

[Alberto Aldegheri (albyrock87)]

In two words:
- fix on awn_round_rect to avoid glitches
- fix and simplify edgy code
- rewrite of 3D style (now using floaty_offset too)
- Lucido with separators and a "fake 3D" style (with no thickness)

:)

[Michal Hruby (mhr3)]

I didn't do code review yet, but from playing around with it:
1) The new 3D style is awesome, but something has to be done with the floaty offset, as I mentioned on IRC, it's not a good idea to support it in other than "Floaty" styles. If you want to control the "thickness" add a new key for it.
2) I don't even remember now how did our old 3d style looked like, but is it still possible to have it with a combination of the config keys?
3) Lucido - I don't like that it also listens to 3d angle, there's not much "3d" on it, and personally I find the addition forceful - I'd recommend to remove it completely or at least use some other key and not 3d angle, as the default for angle isn't suitable (perhaps curviness? the old 3d code used it to change the size of the panel, and default there is 1.0, so it'd be fine).
4) Lucido is much better with separators as opposed to expanders, but the jumping when opening / closing new tasks is a deal breaker, this needs to be fixed!

review: Needs Fixing (behaviour)

[Alberto Aldegheri (albyrock87)]

> 1) The new 3D style is awesome, but something has to be done with the floaty
> offset, as I mentioned on IRC, it's not a good idea to support it in other
> than "Floaty" styles. If you want to control the "thickness" add a new key for
> it.
Solved with new "Thickness" key -> 0.0 < thickness < 1.0 default = 0.6
Thickness in pixel = thickness * MAX_THICKNESS.
MAX_THICKNESS = 10px

> 2) I don't even remember now how did our old 3d style looked like, but is it
> still possible to have it with a combination of the config keys?
It is possible with one limitation : the inner border
You can see it enabling DRAW_INTERNAL_BORDER define on top of awn-background-3d.c
It is disabled because it doesn't look good with some combination of color.

> 3) Lucido - I don't like that it also listens to 3d angle, there's not much
> "3d" on it, and personally I find the addition forceful - I'd recommend to
> remove it completely or at least use some other key and not 3d angle, as the
> default for angle isn't suitable (perhaps curviness? the old 3d code used it
> to change the size of the panel, and default there is 1.0, so it'd be fine).
Removed 3d on Lucido.
Added curves symmetry to control the stripe part height :)
> 4) Lucido is much better with separators as opposed to expanders, but the
> jumping when opening / closing new tasks is a deal breaker, this needs to be
> fixed!
I need to work on this.

[Alberto Aldegheri (albyrock87)]

> 4) Lucido is much better with separators as opposed to expanders, but the
> jumping when opening / closing new tasks is a deal breaker, this needs to be
> fixed!
Done :)

[Alberto Aldegheri (albyrock87)]

Wait before merge, there is a bug that I need to fix when moving separators..

Btw you can do code review :)

[Alberto Aldegheri (albyrock87)]

Now Lucido is more consistent with other styles.

Borders are now borders :)
Stripe gradient is now controlled by highlight colors :)

Curves Symmetry now controls both parts.

[Alberto Aldegheri (albyrock87)]

mhr3, I think that now this is ready for a new review and code review :)

[Michal Hruby (mhr3)]

I'm not going to do a detailed code review of the drawing code (as I didn't write most of that code anyway), the rest looks quite good, though there are a few issues:
Changes to Edgy you introduced bring a bug on the circle when you're using semi-transparent colors. Also if the code is about to be kept, get rid of the craziness with memcpy of GdkRectangle - it's a simple struct, allocating it on stack and assigning to it will work just fine.
Also it'd be nice to add public getter/setter methods for the new properties in AwnSeparator.

review: Needs Fixing (code-review)

[Alberto Aldegheri (albyrock87)]

> Changes to Edgy you introduced bring a bug on the circle when you're using
> semi-transparent colors. Also if the code is about to be kept, get rid of the
> craziness with memcpy of GdkRectangle - it's a simple struct, allocating it on
> stack and assigning to it will work just fine.
Done :)
> Also it'd be nice to add public getter/setter methods for the new properties
> in AwnSeparator.
I don't understand... new properties are accessible through:
g_object_set (G_OBJECT (widget_separator), "transparent", TRUE, NULL);

[Alberto Aldegheri (albyrock87)]

> Also it'd be nice to add public getter/setter methods for the new properties
> in AwnSeparator.

All done.
I've made a little change in awn-applet-manager, and awn-panel (rev 752).

I think that now it's all fixed, and we can move on :)

For me it's ready to merge :)

[Alberto Aldegheri (albyrock87)]

NOooo stop!

[Alberto Aldegheri (albyrock87)]

ok, fixed :)

[Michal Hruby (mhr3)]

Please fix 3065.

[Alberto Aldegheri (albyrock87)]

> Please fix 3065.
Sorry Michal, fixed :)

[Michal Hruby (mhr3)]

There's still a problem with the changes to Edgy - if there's only one icon, it doesn't display only the circle. Other than that I don't see any problems...

Please resubmit once fixed.

review: Needs Fixing

[Alberto Aldegheri (albyrock87)]

Here we are! :)
I've changed Edgy code a bit to make it simplier and faster (during aling change).

Resubmitting proposal now :)

[lp:~albyrock87/awn/awn-lucido]

761. By Alberto <alby@CASA> on 2010-07-16

Revert changes to flat

[Michal Hruby (mhr3)]

review: Approve

=== modified file 'awn-settings/awn-settings.ui'
--- awn-settings/awn-settings.ui	2010-06-03 23:39:31 +0000
+++ awn-settings/awn-settings.ui	2010-07-16 11:56:43 +0000
@@ -899,22 +899,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkSpinButton" id="theme_stripe_width">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                                <property name="adjustment">adj_stripe_width</property>
-                                <property name="digits">2</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">11</property>
-                                <property name="bottom_attach">12</property>
-                                <property name="x_options"></property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkSpinButton" id="theme_angle">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -972,19 +956,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label_stripe">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">10</property>
-                                <property name="label" translatable="yes">Stripe Width</property>
-                              </object>
-                              <packing>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">11</property>
-                                <property name="bottom_attach">12</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkLabel" id="label49">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
@@ -1649,6 +1620,35 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="label_thickness">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="xpad">10</property>
+                                <property name="label" translatable="yes">Thickness</property>
+                              </object>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">11</property>
+                                <property name="bottom_attach">12</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="theme_thickness">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="adjustment">adj_thickness</property>
+                                <property name="digits">2</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="right_attach">3</property>
+                                <property name="top_attach">11</property>
+                                <property name="bottom_attach">12</property>
+                                <property name="x_options"></property>
+                              </packing>
+                            </child>
+                            <child>
                               <placeholder/>
                             </child>
                             <child>
@@ -3439,10 +3439,6 @@
     <property name="upper">1</property>
     <property name="step_increment">0.01</property>
   </object>
-  <object class="GtkAdjustment" id="adj_stripe_width">
-    <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-  </object>
   <object class="GtkAdjustment" id="adj_radius">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -3457,6 +3453,10 @@
     <property name="upper">100</property>
     <property name="step_increment">1</property>
   </object>
+  <object class="GtkAdjustment" id="adj_thickness">
+    <property name="upper">1</property>
+    <property name="step_increment">0.05</property>
+  </object>
   <object class="GtkAdjustment" id="adj_3d_angle">
     <property name="upper">90</property>
     <property name="step_increment">1</property>

=== modified file 'awn-settings/awnDefs.py.in'
--- awn-settings/awnDefs.py.in	2010-05-31 17:41:58 +0000
+++ awn-settings/awnDefs.py.in	2010-07-16 11:56:43 +0000
@@ -86,8 +86,8 @@
 PANEL_ANGLE             = "panel_angle"         #float
 CURVINESS               = "curviness"           #float
 CURVES_SYMMETRY         = "curves_symmetry"     #float
-STRIPE_WIDTH            = "stripe_width"        #float
 FLOATY_OFFSET           = "floaty_offset"       #int
+THICKNESS               = "thickness"           #float
 TOOLTIP_FONT_NAME       = "tooltip_font_name"   #string
 TOOLTIP_FONT_COLOR      = "tooltip_font_color"  #string
 TOOLTIP_BG_COLOR        = "tooltip_bg_color"    #string

=== modified file 'awn-settings/awnSettings.py.in'
--- awn-settings/awnSettings.py.in	2010-05-31 17:41:58 +0000
+++ awn-settings/awnSettings.py.in	2010-07-16 11:56:43 +0000
@@ -579,8 +579,8 @@
     
     curviness = gobject.property(type=float, default=1)
     curves_symmetry = gobject.property(type=float, default=0)
-    stripe_width = gobject.property(type=float, default=0)
     floaty_offset = gobject.property(type=int, default=10)
+    thickness = gobject.property(type=float, default=0)
     angle = gobject.property(type=int, default=45)
     radius = gobject.property(type=int, default=10)
     gtk_theme_mode = gobject.property(type=bool, default=False)
@@ -730,7 +730,7 @@
 			(defs.THEME, defs.PANEL_ANGLE, 'float', sizes),
 			(defs.THEME, defs.CURVINESS, 'float', sizes),
 			(defs.THEME, defs.CURVES_SYMMETRY, 'float', sizes),
-			(defs.THEME, defs.STRIPE_WIDTH, 'float', sizes),
+			(defs.THEME, defs.THICKNESS, 'float', sizes),
 			(defs.THEME, defs.FLOATY_OFFSET, 'int', sizes),
 			(defs.THEME, defs.TOOLTIP_FONT_NAME, 'str', icon),
 			(defs.THEME, defs.TOOLTIP_FONT_COLOR, 'str', icon),
@@ -828,12 +828,12 @@
                 "curviness", "theme_curviness"),
             (self.client, defs.THEME, defs.CURVES_SYMMETRY,
                 "curves-symmetry", "theme_symmetry"),
-            (self.client, defs.THEME, defs.STRIPE_WIDTH,
-                "stripe-width", "theme_stripe_width"),
             (self.client, defs.THEME, defs.PANEL_ANGLE,
                 "angle", "theme_angle"),
             (self.client, defs.THEME, defs.FLOATY_OFFSET,
                 "floaty-offset", "theme_floaty_offset"),
+            (self.client, defs.THEME, defs.THICKNESS,
+                "thickness", "theme_thickness"),
             (self.client, defs.THEME, defs.CORNER_RADIUS,
                 "radius", "theme_radius"),
             (self.client, defs.THEME, defs.TOOLTIP_FONT_NAME,

=== modified file 'data/avant-window-navigator.schema-ini.in.in'
--- data/avant-window-navigator.schema-ini.in.in	2010-07-07 09:12:12 +0000
+++ data/avant-window-navigator.schema-ini.in.in	2010-07-16 11:56:43 +0000
@@ -233,10 +233,10 @@
 _description=The offset of the Floaty background.
 per_instance = false
 
-[theme/stripe_width]
+[theme/thickness]
 type = float
-default = 0.0
-_description=The width of the stripe in Lucido mode.
+default = 0.6
+_description=The thickness in 3D mode.
 per_instance = false
 
 [theme/dialog_gtk_mode]

=== modified file 'libawn/awn-cairo-utils.c'
--- libawn/awn-cairo-utils.c	2010-01-10 14:43:43 +0000
+++ libawn/awn-cairo-utils.c	2010-07-16 11:56:43 +0000
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Author : Anthony Arobone <[e-mail]>
+ *           Alberto Aldegheri <[e-mail]>
  *           (awn_cairo_rounded_rect)
  *  Author : Mark Lee <[e-mail]>
  *           (awn_cairo_set_source_color,
@@ -42,16 +43,46 @@
   /* arc with radius == 0.0 doesn't paint anything */
   if (radius == 0.0) state = ROUND_NONE;
 
-  cairo_move_to (cr, rx0, ry1 - radius);
+  /* fix to radius to avoid wrong draws */
+  if (radius > height / 2. && (
+        ((state & ROUND_TOP_LEFT) && (state & ROUND_BOTTOM_LEFT)) ||
+        ((state & ROUND_TOP_RIGHT) && (state & ROUND_BOTTOM_RIGHT))
+      ))
+  {
+    radius = height / 2.;
+  }
+  else if (radius > height)
+  {
+    radius = height;
+  }
+  if (radius > width / 2. && (
+        ((state & ROUND_TOP_LEFT) && (state & ROUND_TOP_RIGHT)) ||
+        ((state & ROUND_BOTTOM_LEFT) && (state & ROUND_BOTTOM_RIGHT))
+      ))
+  {
+    radius = width / 2.;
+  }
+  else if (radius > width)
+  {
+    radius = width;
+  }
 
   /* top left corner */
-
   if (state & ROUND_TOP_LEFT)
   {
+    if (state & ROUND_BOTTOM_LEFT)
+    {
+      cairo_move_to (cr, rx0, ry1 - radius);
+    }
+    else
+    {
+      cairo_move_to (cr, rx0, ry1);
+    }
     cairo_arc (cr, rx0 + radius, ry0 + radius, radius, M_PI, M_PI * 1.5);
   }
   else
   {
+    cairo_move_to (cr, rx0, ry1 - radius);
     cairo_line_to (cr, rx0, ry0);
   }
 

=== modified file 'src/awn-applet-manager.c'
--- src/awn-applet-manager.c	2010-04-08 15:38:05 +0000
+++ src/awn-applet-manager.c	2010-07-16 11:56:43 +0000
@@ -88,6 +88,7 @@
   APPLET_EMBEDDED,
   APPLET_REMOVED,
   SHAPE_MASK_CHANGED,
+  APPLETS_REFRESHED,
 
   LAST_SIGNAL
 };
@@ -402,7 +403,16 @@
                  NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
- 
+
+  _applet_manager_signals[APPLETS_REFRESHED] =
+    g_signal_new("applets-refreshed",
+                 G_OBJECT_CLASS_TYPE(obj_class),
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET(AwnAppletManagerClass, applets_refreshed),
+                 NULL, NULL,
+                 g_cclosure_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
+
   g_type_class_add_private (obj_class, sizeof (AwnAppletManagerPrivate));
 }
 
@@ -913,6 +923,7 @@
     priv->expands = TRUE;
     g_object_notify (G_OBJECT (manager), "expands");
   }
+  g_signal_emit (manager, _applet_manager_signals[APPLETS_REFRESHED], 0);
 }
 
 void
@@ -1170,6 +1181,8 @@
   g_object_notify (G_OBJECT (manager), "expands");
 
   g_list_free (list);
+  /* Emit refresh signal for applets when swithcing docklet mode */
+  g_signal_emit (manager, _applet_manager_signals[APPLETS_REFRESHED], 0);
 }
 
 void
@@ -1194,14 +1207,8 @@
   g_object_notify (G_OBJECT (manager), "expands");
 
   g_list_free (list);
-}
-
-gboolean
-awn_applet_manager_get_docklet_mode (AwnAppletManager *manager)
-{
-  g_return_val_if_fail (AWN_IS_APPLET_MANAGER (manager), FALSE);
-
-  return manager->priv->docklet_mode;
+  /* Emit refresh signal for applets when swithcing docklet mode */
+  g_signal_emit (manager, _applet_manager_signals[APPLETS_REFRESHED], 0);
 }
 
 void

=== modified file 'src/awn-applet-manager.h'
--- src/awn-applet-manager.h	2009-11-28 22:33:39 +0000
+++ src/awn-applet-manager.h	2010-07-16 11:56:43 +0000
@@ -66,6 +66,7 @@
   void (*applet_embedded)    (AwnAppletManager *manager, GtkWidget *applet);
   void (*applet_removed)     (AwnAppletManager *manager, GtkWidget *applet);
   void (*shape_mask_changed) (AwnAppletManager *manager);
+  void (*applets_refreshed)  (AwnAppletManager *manager);
 };
 
 GType       awn_applet_manager_get_type          (void) G_GNUC_CONST;
@@ -93,7 +94,6 @@
 
 void        awn_applet_manager_add_docklet       (AwnAppletManager *manager,
                                                   GtkWidget *docklet);
-gboolean    awn_applet_manager_get_docklet_mode  (AwnAppletManager *manager);
 
 void        awn_applet_manager_redraw_throbbers  (AwnAppletManager *manager);
 

=== modified file 'src/awn-background-3d.c'
--- src/awn-background-3d.c	2009-12-22 21:09:43 +0000
+++ src/awn-background-3d.c	2010-07-16 11:56:43 +0000
@@ -15,7 +15,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  *
- *  Author : h4writer <[e-mail]>
+ *  Original Author : h4writer <[e-mail]>
+ *  Rewrited by: Alberto Aldegheri <[e-mail]>
  *
  */
 
@@ -27,22 +28,43 @@
 #include "awn-x.h"
 
 #include <math.h>
-
-/* The pixels to draw the side of the panel*/
-#define SIDE_SPACE 4
+#include "awn-applet-manager.h"
+
+#define MAX_THICKNESS 12.
+#define PADDING_BOTTOM 1
+#define PADDING_TOP 1
+#define BORDER_LINE_WIDTH 1
+
+/* There is a refresh bug when we are near the left border */
+#define DRAW_XPADDING 2
 
 /* Some defines for debugging */
-#define DEBUG_DRAW_INTERNAL_BORDER_BOTTOM     TRUE
-#define DEBUG_DRAW_EXTERNAL_BORDER_BOTTOM     TRUE
-#define DEBUG_DRAW_SIDE                       TRUE
-#define DEBUG_DRAW_INTERNAL_BORDER_TOP        TRUE
-#define DEBUG_DRAW_EXTERNAL_BORDER_TOP        TRUE
-#define DEBUG_DRAW_HIGHLIGHT                  TRUE
+#define DRAW_SIDE                       TRUE
+#define DRAW_EXTERNAL_BORDER            TRUE
+/* Internal border isn't good-looking for now */
+/* We need another color, because Inner Border Color */
+/* is used for paint the side face of 3D */
+#define DRAW_INTERNAL_BORDER            FALSE
+#define DRAW_HIGHLIGHT                  TRUE
+#define CLEAR_TOP_BEFORE_PAINT          FALSE
+#define FILL_BOTTOM_PLANE               FALSE
 
+/* Enable this for paint the shape mask */
 #define DEBUG_DRAW_INPUT_SHAPE_MASK           FALSE
 
+#define TRANSFORM_RADIUS(x) (x / 90. * 75)
+#define OBTAIN_THICKNESS(rad,thick) (floor(sin(TRANSFORM_RADIUS(rad)*\
+                                               M_PI/180.)*MAX_THICKNESS*thick))
+
 G_DEFINE_TYPE (AwnBackground3d, awn_background_3d, AWN_TYPE_BACKGROUND)
 
+struct _Point3
+{
+  float x;
+  float y;
+  float z;
+};
+typedef struct _Point3 Point3;
 /* FORWARDS */
 static void awn_background_3d_padding_request (AwnBackground *bg,
                                                GtkPositionType position,
@@ -83,6 +105,14 @@
   g_signal_connect (bg, "notify::panel-angle", 
                     G_CALLBACK (awn_background_3d_update_padding), 
                     NULL);
+
+  g_signal_connect (bg, "notify::corner-radius", 
+                    G_CALLBACK (awn_background_3d_update_padding), 
+                    NULL);
+
+  g_signal_connect (bg, "notify::thickness", 
+                    G_CALLBACK (awn_background_3d_update_padding), 
+                    NULL);
 }
 
 static void
@@ -160,32 +190,18 @@
  * @param x: the x pos in the flat dimension
  * @param y: the y pos in the perspective
  * 
- * Calculates the x position of the point (x,y) in the flat dimension brought back in the perspective
+ * Calculates the x position of the point (x,y) in the flat dimension 
+ * brought back in the perspective
  * note: - the bottom left corner is (0,0)
  *       - the bottom right corner should be (width, 0)
  *
- * Returns: gives the x position back of the point (x,y) in the flat dimension brought back in the perspective
+ * Returns: gives the x position back of the point (x,y) in the flat dimension
+ * brought back in the perspective
  */
 static double
 apply_perspective_x( double width, double angle, double x, double y )
 {
-		return (width/2.0-x)/(width/2.0*tan((90-angle)*M_PI/180))*y+x;
-}
-
-/**
- * get_width_on_height:
- * @param width: the current width of the bar
- * @param angle: the angle the bar will have
- * @param y: the y pos in the perspective
- *
- * Calculates the width of the bar on a given y-pos (in the perspective)
- *
- * Returns: a double containing the width
- */
-static double
-get_width_on_height( double width, double angle, double y )
-{
-		return width-2*y/tan((90-angle)*M_PI/180);
+		return (width/2.0-x)/(width/2.0*tan((90-angle)*M_PI/180)*1.5)*y+x;
 }
 
 /**
@@ -194,100 +210,164 @@
  * @param point2: control point 2
  * @param point3: control point 3
  * @param point4: control point 4
- * @param t: the position between O and 1 (0 gives back point1, 1 gives back point4)
- *
- * This function is used to get back the left most position of the rounded corner,
- * to let the side of the bar begin there.
- *
- * - Note: Not used atm. Can be I need it later on, but for now it's commented out.
- *
- * Returns: gives back the position of the cubic bezier curve constructed with these control points 
+ * @param t: the position between O and 1 
+ *          (0 gives back point1, 1 gives back point4)
+ *
+ * This function is used to get back the left most position of the rounded
+ * corner to let the side of the bar begin there.
+ *
+ * Note: Not used atm. Can be I need it later on, but for now it's commented out
+ *
+ * Returns: gives back the position of the cubic bezier curve constructed with
+ *          these control points 
  */
-/*static double cubic_bezier_curve(double point1, double point2, double point3, double point4, double t)
+/*static double cubic_bezier_curve(double point1, double point2, double point3,
+                                   double point4, double t)
 {
-	return (1-t)*(1-t)*(1-t)*point1 + 3*t*(1-t)*(1-t)*point2 + 3*t*t*(1-t)*point3 + t*t*t*point4;
+	return (1-t)*(1-t)*(1-t)*point1 + 3*t*(1-t)*(1-t)*point2 + 
+	                        3*t*t*(1-t)*point3 + t*t*t*point4;
 }*/
 
-
-/*
- * Drawing functions
+/**
+ * calc_points
+ * @param bg: AwnBackground
+ * @param x: the begin x position to draw 
+ * @param y: the begin y position to draw
+ * @param width: the width for the drawing
+ * @param height: the height for the drawing
+ *
+ * Calculates vertices to draw the path
  */
-
+static Point3*
+calc_points (AwnBackground  *bg,
+             float           x,
+             float           y,
+             float           width,
+             float           height)
+{
+  float xp0, xp1, xp2, xp3, yp0, yp1, yp2, yp3;
+  float radius = bg->corner_radius;
+  /**
+   * rb = decrease the radius on bottom vertices
+   * ex = increase the x-radius on top vertices
+   */
+  float rb = 0., ex = 0.;
+  /* calc sin and cos for current angle */
+  float s = sin (TRANSFORM_RADIUS (bg->panel_angle) * M_PI / 180.);
+  float c = cos (TRANSFORM_RADIUS (bg->panel_angle) * M_PI / 180.);
+
+  /* Adjust radius */
+  if (radius > height)
+  {
+    ex = radius - height;
+    radius = height;
+  }
+  if (radius > height / 2.)
+  {
+    rb = 2. * radius - height;
+  }
+  if (radius == 0.)
+  {
+    /* for nice edges */
+    radius = 0.5;
+  }
+
+  /* Carefull: here (0,0) is in the top left corner of the screen
+   */
+  /*        0   1                   2    3
+   *    A   x0  x1                  x2  x3     B
+   *        |___|___________________|___|__y0
+   *   11   |                           |__y1     4
+   *        |                           |
+   *   10   |                           |__y2     5
+   *        |___________________________|__y3     6
+   *    D   9   8                   7          C
+   *
+   * WARNING!! When draw the path, remember that ->
+   *                 A becomes D
+   *                 B becomes C
+   */
+  xp0 = 0.;
+  xp1 = radius;
+  xp2 = width - radius;
+  xp3 = width;
+
+  yp0 = 0.;
+  yp1 = radius;
+  yp2 = height - radius;
+  yp3 = height;
+
+  Point3 *vertices = (Point3 *) malloc (sizeof (Point3) * 12); 
+  float z = 2; 
+  vertices[0] = (Point3){xp0, yp0, z};
+  vertices[1] = (Point3){xp1 - rb, yp0, z};
+  vertices[2] = (Point3){xp2 + rb, yp0, z};
+  vertices[3] = (Point3){xp3, yp0, z};
+  vertices[4] = (Point3){xp3, yp1 - rb, z};
+  vertices[5] = (Point3){xp3, yp2, z};
+  vertices[6] = (Point3){xp3, yp3, z};
+  vertices[7] = (Point3){xp2 - ex, yp3, z};
+  vertices[8] = (Point3){xp1 + ex, yp3, z};
+  vertices[9] = (Point3){xp0, yp3, z};
+  vertices[10] = (Point3){xp0, yp2, z};
+  vertices[11] = (Point3){xp0, yp1 - rb, z};
+
+  int i = 0;
+
+  for (; i < 12; ++i)
+  {
+    /* 3D ROTATION OVER X AXIS */
+    vertices[i].y = c * vertices[i].y - s * vertices[i].z;
+    vertices[i].z = s * vertices[i].y + c * vertices[i].z;
+
+    /* 3D to 2D - For now, use apply_perspective_x
+     * maybe in the future we use projection matrix
+     */
+    vertices[i].x = apply_perspective_x (width, 
+                                         TRANSFORM_RADIUS(bg->panel_angle),
+                                         vertices[i].x,
+                                         vertices[i].y ) + x;
+    /* Invert coordinates for our Y coordinate system cutted to int */
+    vertices[i].y = floor (height - vertices[i].y + y);
+  }
+  /* use vertices[8]->y to find the top coordinate of the panel */
+  return vertices;
+} 
 /**
  * draw_rect_path:
- * @param bg: AwnBackground
  * @param cr: a cairo context 
- * @param x: the begin x position to draw 
- * @param y: the begin y position to draw
- * @param width: the width for the drawing
- * @param height: the height for the drawing
- * @param padding: makes the path X amount of pixels smaller on every side
- *
+ * @param vertices: vertices to use for drawing 
+ * @param padding: padding from top
+ * 
  * This function draws the path of the bar in perspective.
  */
 static void 
-draw_rect_path (AwnBackground  *bg,
-                cairo_t        *cr, 
-                gdouble         x,
-                gdouble         y,
-                gint            width,
-                gint            height,
-                gint            padding)
+draw_rect_path (cairo_t *cr, Point3 *vertices, float padding)
 {
-  double x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11,
-         cy0, cy1, cy2, cy3;
-  double radius = bg->corner_radius;
-
-  /* Carefull: here (0,0) is in the top left corner of the screen
-   *    (x3,cy3)  (x4,cy3)      (x5,cy3) (x6,cy3)
-   *           '-.,  |              | ,.-'
-   *    (x2,cy2)___.-''''''''''''''''-.___(x7,cy2)
-   *              /                    \
-   *  (x1,cy1)___/                      \___(x8,cy1)
-   *             '.____________________.'
-   *  (x0,cy0)--'´|                   | `'--(x9,cy0)
-   *          (x11,cy0)           (x10,cy0)
-   */
-
-  x0 = x + apply_perspective_x(width, bg->panel_angle, padding, padding);
-  x1 = x + apply_perspective_x(width, bg->panel_angle, padding, radius+padding);
-  x2 = x + apply_perspective_x(width, bg->panel_angle, padding, height/2.0-radius-padding);
-  x3 = x + apply_perspective_x(width, bg->panel_angle, padding, height/2.0-padding);
-  x4 = x + apply_perspective_x(width, bg->panel_angle, radius+padding, height/2.0-padding);
-  x5 = x + apply_perspective_x(width, bg->panel_angle, width-radius-padding, height/2.0-padding);
-  x6 = x + apply_perspective_x(width, bg->panel_angle, width-padding, height/2.0-padding);
-  x7 = x + apply_perspective_x(width, bg->panel_angle, width-padding, height/2.0-radius-padding);
-  x8 = x + apply_perspective_x(width, bg->panel_angle, width-padding, radius+padding);
-  x9 = x + apply_perspective_x(width, bg->panel_angle, width-padding, padding);
-  x10 = x + apply_perspective_x(width, bg->panel_angle, width-radius-padding, padding);
-  x11 = x + apply_perspective_x(width, bg->panel_angle, radius+padding, padding);
-
-  cy0 = y + height - padding;
-  cy1 = y + height - radius - padding;
-  cy2 = y + height/2.0 + radius + padding;
-  cy3 = y + height/2.0 + padding;
-
-  cairo_move_to(cr, x2, cy2);
-  cairo_curve_to(cr, x3, cy3, x3, cy3, x4, cy3);
-  cairo_line_to(cr, x5, cy3);
-  cairo_curve_to(cr, x6, cy3, x6, cy3, x7, cy2);
-  if( x8 > x7 )
-  {
-    /* draw the rounded corners on the bottom too */
-    cairo_line_to(cr, x8, cy1);
-    cairo_curve_to(cr, x9, cy0, x9, cy0, x10, cy0);
-    cairo_line_to(cr, x11, cy0);
-    cairo_curve_to(cr, x0, cy0, x0, cy0, x1, cy1);
-    cairo_line_to(cr, x2, cy2);
-  }
-  else
-  {
-    /* the radius is to big, so only draw the rounded corners on the top. On the bottom just ordinary corners. */
-    cairo_line_to(cr, x9, cy0);
-    cairo_line_to(cr, x0, cy0);
-    cairo_line_to(cr, x2, cy2);
-  }
-
+
+  /* Let's make the path '*/
+  cairo_new_path (cr);
+  cairo_move_to (cr,  vertices[1].x, vertices[1].y + padding);
+
+  cairo_line_to (cr,  vertices[2].x, vertices[2].y + padding);
+  cairo_curve_to (cr, vertices[2].x, vertices[2].y + padding,
+                      vertices[3].x, vertices[3].y + padding,
+                      vertices[4].x, vertices[4].y + padding);
+
+  cairo_line_to (cr,  vertices[5].x, vertices[5].y + padding);
+  cairo_curve_to (cr, vertices[6].x, vertices[6].y + padding,
+                      vertices[7].x, vertices[7].y + padding,
+                      vertices[7].x, vertices[7].y + padding);
+
+  cairo_line_to (cr,  vertices[8].x, vertices[8].y + padding);
+  cairo_curve_to (cr, vertices[8].x, vertices[8].y + padding,
+                      vertices[9].x, vertices[9].y + padding,
+                      vertices[10].x, vertices[10].y + padding);
+
+  cairo_line_to (cr,  vertices[11].x, vertices[11].y + padding);
+  cairo_curve_to (cr, vertices[0].x, vertices[0].y + padding,
+                      vertices[1].x, vertices[1].y + padding,
+                      vertices[1].x, vertices[1].y + padding);
   cairo_close_path(cr);
 }
 
@@ -304,111 +384,214 @@
 static void
 draw_top_bottom_background (AwnBackground  *bg,
                             cairo_t        *cr,
-                            gint            width,
-                            gint            height)
+                            gfloat          width,
+                            gfloat          height)
 {
-#if DEBUG_DRAW_SIDE
-  int i;
-#endif
   cairo_pattern_t *pat;
+  float s = OBTAIN_THICKNESS (bg->panel_angle, bg->thickness);
 
-  height -= SIDE_SPACE;
+  height -= (s + PADDING_BOTTOM + 1.);
 
   /* Basic set-up */
   cairo_set_line_width (cr, 1.0);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_translate (cr, 0.5, 0.5);
-
-#if DEBUG_DRAW_INTERNAL_BORDER_BOTTOM
-  /* Internal border (on the bottom) */
-  awn_cairo_set_source_color (cr, bg->hilight_color),
-  draw_rect_path (bg, cr, 0, SIDE_SPACE, width, height, 1);
-  cairo_stroke (cr);
-#endif
-
-#if DEBUG_DRAW_EXTERNAL_BORDER_BOTTOM
-  /* External border (on the bottom) */
-  awn_cairo_set_source_color (cr, bg->border_color);
-  draw_rect_path (bg, cr, 0, SIDE_SPACE,  width, height, 0.5);
-  cairo_stroke (cr);
-
-  /* Draw the background (on the bottom) */
-  //FIXME: I'm doubting if it is nicer with or without the bottom background drawn
-  /*pat = cairo_pattern_create_linear (0, 0, 0, height);
-  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
-
-  draw_rect_path (bg, cr, 0, 0, width, height, 0.5);
-  cairo_set_source (cr, pat);
-  cairo_fill (cr);
-
-  cairo_pattern_destroy (pat);*/
-
-  /* draw the side */
-  /* TODO: if a side has no rounded corners, the border should be drawn. */
-  pat = cairo_pattern_create_linear (0, 0, 0, height);
-  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
-  cairo_set_source (cr, pat);
-  for(i=SIDE_SPACE-1; i>0; i--)
+  /* Translate for sharp edges and for avoid drawing's glitches */
+  cairo_translate (cr, DRAW_XPADDING, 0.5);
+  width -= DRAW_XPADDING * 2.;
+
+  /* calc vertices for draw the main path */
+  Point3 *vertices = calc_points (bg, 0., 0., width, height);
+  /* calc the y coord of the top panel, used for pattern painting */
+  float top_y = vertices[8].y;
+
+  double red, green, blue, alpha;
+  /* Save general context */
+  cairo_save (cr);
+#if DRAW_SIDE
+  /* Internal border (The Side of the 3D panel) */
+  /* Draw only if it will be visible */
+  if (bg->panel_angle > 0)
   {
-    draw_rect_path (bg, cr, 0, i,  width, height, 0.5);
-    cairo_stroke (cr);
+    float i;
+
+    /* Draw bottom plane (Inner Border Color) with
+     * its own border (Outer Border Color)
+     */
+    desktop_agnostic_color_get_cairo_color
+                        (bg->hilight_color, &red, &green, &blue, &alpha);
+    /* if side is transparent (1. / 255.), don't draw bottom border */
+    if (alpha > 0.003)
+    {
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+      draw_rect_path (cr, vertices, s);
+#if FILL_BOTTOM_PLANE
+      cairo_save (cr);
+      awn_cairo_set_source_color (cr, bg->hilight_color);
+      cairo_clip (cr);
+      cairo_paint (cr);
+      cairo_restore (cr);
+#endif
+      cairo_set_line_width (cr, BORDER_LINE_WIDTH);
+      awn_cairo_set_source_color (cr, bg->border_color);
+      cairo_stroke (cr);
+
+      /* Pixel per Pixel draw each plane only with border from bottom to top */
+      cairo_set_line_width (cr, 1.5);
+      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+      for (i = s - 1.; i >= 0. ; i -= 1.)
+      {
+        draw_rect_path (cr, vertices, i);
+        awn_cairo_set_source_color (cr, bg->hilight_color);
+        cairo_stroke (cr);
+      }
+      /* draw edges lines if corner-radius is smaller then 3px */
+      if (bg->corner_radius < 4 || bg->corner_radius > (height - 3))
+      {
+        double alpha_coeff = bg->corner_radius;
+        cairo_move_to (cr, vertices[0].x, vertices[0].y);
+        cairo_line_to (cr, vertices[0].x, vertices[0].y + s);
+        cairo_move_to (cr, vertices[3].x, vertices[3].y);
+        cairo_line_to (cr, vertices[3].x, vertices[3].y + s);
+        if (bg->corner_radius < 4)
+        {
+          cairo_move_to (cr, vertices[6].x, vertices[6].y);
+          cairo_line_to (cr, vertices[6].x, vertices[6].y + s);
+          cairo_move_to (cr, vertices[9].x, vertices[9].y);
+          cairo_line_to (cr, vertices[9].x, vertices[9].y + s);
+        }
+        else
+        {
+          alpha_coeff = fabs (MIN (bg->corner_radius, height) - height);
+        }
+        alpha_coeff = (1.0 - alpha_coeff / 3.);
+        cairo_set_line_width (cr, BORDER_LINE_WIDTH);
+        desktop_agnostic_color_get_cairo_color
+                        (bg->border_color, &red, &green, &blue, &alpha);
+        /* edges fade effect when increasing the corner radius from 0 to 3 */
+        cairo_set_source_rgba (cr, red, green, blue, 
+                               alpha * alpha_coeff);
+        cairo_stroke (cr);
+      }
+    }
+    /* Clear the area for the top plane
+     *-> hides "back border" when top is transparent
+     *-> disabled for now...
+     */
+#if CLEAR_TOP_BEFORE_PAINT
+    cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+    draw_rect_path (cr, vertices, 0.);
+    cairo_save (cr);
+    cairo_set_source_rgba (cr, 0., 0., 0., 1.);
+    cairo_clip (cr);
+    cairo_paint (cr);
+    cairo_restore (cr);
+#endif
   }
+#endif
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  cairo_set_line_width (cr, 2.);
+  /* Draw the path of top plane */
+  draw_rect_path (cr, vertices, 0.);
+  /* obtain 0.0 - 1.0 relative height for pattern drawing */
+  top_y = top_y / height;
 
+  /* Paint the top plane gradient */
+  pat = cairo_pattern_create_linear (0., 0., 0., height);
+  awn_cairo_pattern_add_color_stop_color (pat, top_y, bg->g_step_1);
+  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
+  cairo_save (cr);
+  cairo_clip_preserve (cr);
+  cairo_set_source (cr, pat);
+  cairo_paint (cr);
   cairo_pattern_destroy (pat);
-#endif
+  cairo_restore (cr);
 
-  /* Draw the background (on the top) */
   if (bg->enable_pattern && bg->pattern)
   {
+    /* Paint the top plane pattern */
+    cairo_save (cr);
     pat = cairo_pattern_create_for_surface (bg->pattern);
     cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT);
-  }
-  else
-  {
-    pat = cairo_pattern_create_linear (0, 0, 0, height);
-    awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
-    awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
-  }
-
+    cairo_clip_preserve (cr);
+    cairo_set_source (cr, pat);
+    cairo_paint (cr);
+    cairo_pattern_destroy (pat);
+    cairo_restore (cr);
+  }
+
+#if DRAW_HIGHLIGHT
+  /* Prepare the hi-light */
+  pat = cairo_pattern_create_linear (0., 0., 0., height);
+  awn_cairo_pattern_add_color_stop_color
+                        (pat, top_y + 0.0, bg->g_histep_1);
+  awn_cairo_pattern_add_color_stop_color
+                        (pat, top_y + (1. - top_y) * 0.3, bg->g_histep_2);
+
+  desktop_agnostic_color_get_cairo_color
+                        (bg->g_histep_2, &red, &green, &blue, &alpha);
+  cairo_pattern_add_color_stop_rgba
+                        (pat, top_y + (1. - top_y) * 0.4, red, green, blue, 0.);
+  /* Paint the hi-light gradient */
   cairo_save (cr);
-
-  draw_rect_path (bg, cr, 0, 0, width, height, 0.5);
-  cairo_clip (cr);
+  cairo_clip_preserve (cr);
   cairo_set_source (cr, pat);
   cairo_paint (cr);
-
   cairo_restore (cr);
-
-  cairo_pattern_destroy (pat);
-
-#if DEBUG_DRAW_HIGHLIGHT
-  /* Draw the hi-light (on the top) */
-  pat = cairo_pattern_create_linear (0, height/3.0, 0, height*2.0/3.0);
-  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_histep_1);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_histep_2);
-  draw_rect_path (bg, cr, apply_perspective_x(width, bg->panel_angle, 0, height/3.0), height/3.0, get_width_on_height(width, bg->panel_angle, height/3.0), height/3.0, 1.5);
-
-  cairo_set_source (cr, pat);
-  cairo_fill (cr);
-  cairo_pattern_destroy (pat);
-#endif
-
-#if DEBUG_DRAW_INTERNAL_BORDER_TOP
-  /* Internal border (on the top) */
-  awn_cairo_set_source_color (cr, bg->hilight_color);
-  draw_rect_path (bg, cr, 0, 0, width, height, 1);
+  cairo_pattern_destroy (pat);
+#endif
+#if DRAW_INTERNAL_BORDER
+  /* Internal border of the top surface */
+  desktop_agnostic_color_get_cairo_color
+                        (bg->border_color, &red, &green, &blue, &alpha);
+  /* for glass-look don't draw internal border if there is no external border */
+  if (alpha > 0.003)
+  {
+    cairo_save (cr);
+    cairo_scale (cr, (width - 2.) / (width), (height - 2.) / (height));
+    cairo_translate (cr, 1., 1.);
+    draw_rect_path (cr, vertices, 0.);
+    cairo_set_line_width (cr, BORDER_LINE_WIDTH + 0.5);
+    awn_cairo_set_source_color (cr, bg->hilight_color);
+    cairo_stroke (cr);
+    cairo_restore (cr);
+    draw_rect_path (cr, vertices, 0.);
+  }
+#endif
+#if DRAW_EXTERNAL_BORDER
+  /* External border */
+  cairo_set_line_width (cr, BORDER_LINE_WIDTH);
+  awn_cairo_set_source_color (cr, bg->border_color);
   cairo_stroke (cr);
 #endif
-
-#if DEBUG_DRAW_EXTERNAL_BORDER_BOTTOM
-  /* External border (on the top) */
-   awn_cairo_set_source_color (cr, bg->border_color);
-   draw_rect_path (bg, cr, 0, 0,  width, height, 0.5);
-   cairo_stroke (cr);
-#endif
-
+  /* restore genereal context */
+  cairo_restore (cr);
+  /* free memory :) */
+  free (vertices);
+}
+
+/**
+ * _get_applet_manager_size
+ * Obtain width and height from applet manager
+ */
+static void
+_get_applet_manager_size (AwnBackground* bg, GtkPositionType position,
+                          float *w, float *h)
+{
+  AwnAppletManager *manager = NULL;
+  g_object_get (bg->panel, "applet-manager", &manager, NULL);
+
+  switch (position)
+  {
+    case GTK_POS_BOTTOM:
+    case GTK_POS_TOP:
+      *w = GTK_WIDGET (manager)->allocation.width;
+      break;
+    default:
+      *w = GTK_WIDGET (manager)->allocation.height;
+      break;
+  }
+  gint size = 0;
+  g_object_get (manager, "size", &size, NULL);
+  *h = size;
 }
 
 /**
@@ -436,33 +619,54 @@
   guint padding;
   g_object_get (bg->panel, "offset", &offset, "size", &size, NULL);
 
-  if(offset > size)
-    padding = (size+offset)/2.0/tan((90-bg->panel_angle)*M_PI/180);
-  else
-  {
-    double angle = 90 - CLAMP (bg->panel_angle, 0.0, 75.0);
-    double y_pos = size / 2.0 + bg->corner_radius;
-    double x = y_pos / tan (angle * M_PI/180);
-    padding = MAX (x, offset);
-  }
+  /* Find the coordinate of the (0;0) point in the prospective */
+  /* Its X coordinate is equal to the padding */
+  float w,h;
+  _get_applet_manager_size (bg, position, &w, &h);
+  padding = apply_perspective_x
+                      ( w, TRANSFORM_RADIUS(bg->panel_angle), 0., h );
+  /* Padding > h is not needed */
+  if (padding > h)
+  {
+    padding = h;
+  }
+
+  /* Obtain the padding from corner radius */
+  float padding_from_rad = bg->corner_radius;
+
+  if (padding_from_rad > h)
+  {
+    padding_from_rad = h;
+  }
+  if (padding_from_rad > (h / 2.))
+  {
+    padding_from_rad = ( h - padding_from_rad );
+  }
+  /* Sum padding needed */
+  padding = MAX (padding, padding_from_rad) + DRAW_XPADDING;
+  float s = OBTAIN_THICKNESS (bg->panel_angle, bg->thickness);
 
   switch (position)
   {
     case GTK_POS_TOP:
-      *padding_top  = SIDE_SPACE+2; *padding_bottom = 0;
+      *padding_top  = PADDING_BOTTOM + s;
+      *padding_bottom = PADDING_TOP;
       *padding_left = padding; *padding_right = padding;
       break;
     case GTK_POS_BOTTOM:
-      *padding_top  = 0; *padding_bottom = SIDE_SPACE+2;
+      *padding_top  = PADDING_TOP;
+      *padding_bottom = PADDING_BOTTOM + s;
       *padding_left = padding; *padding_right = padding;
       break;
     case GTK_POS_LEFT:
       *padding_top  = padding; *padding_bottom = padding;
-      *padding_left = SIDE_SPACE+2; *padding_right = 0;
+      *padding_left = PADDING_BOTTOM + s;
+      *padding_right = PADDING_TOP;
       break;
     case GTK_POS_RIGHT:
       *padding_top  = padding; *padding_bottom = padding;
-      *padding_left = 0; *padding_right = SIDE_SPACE+2;
+      *padding_left = PADDING_TOP;
+      *padding_right = PADDING_BOTTOM + s;
       break;
     default:
       break;
@@ -482,7 +686,8 @@
  * Draws the bar in the in the cairo context &cr given the position &position,
  * the &x and &y position and given &width and &height
  *
- * Important: every change to this function should get adjusted in input_shape_mask!!!
+ * Important: every change to this function should get 
+ * adjusted in input_shape_mask!!!
  */
 static void 
 awn_background_3d_draw (AwnBackground  *bg,
@@ -498,23 +703,27 @@
   switch (position)
   {
     case GTK_POS_RIGHT:
-      cairo_translate (cr, x-1, y+height);
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
       cairo_rotate (cr, M_PI * 1.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_LEFT:
-      cairo_translate (cr, x+width+1, y);
+      cairo_translate (cr, x + width, y);
       cairo_rotate (cr, M_PI * 0.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_TOP:
-      cairo_translate (cr, x+width, y+height+1);
-      cairo_rotate (cr, M_PI);
+      cairo_translate (cr, x, y + height);
+      cairo_scale (cr, 1., -1.);
       break;
     default:
-      cairo_translate (cr, x, y-1);
+      cairo_translate (cr, x, y);
       break;
   }
 
@@ -543,50 +752,55 @@
                                     GtkPositionType  position,
                                     GdkRectangle   *area)
 {
-  int i;
-  gint temp;
-  gint x = area->x, y = area->y;
-  gint width = area->width, height = area->height;
+  gfloat temp;
+  gfloat x = area->x, y = area->y;
+  gfloat width = area->width, height = area->height;
   cairo_save (cr);
 
   switch (position)
   {
     case GTK_POS_RIGHT:
-      cairo_translate (cr, x-1, y+height);
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
       cairo_rotate (cr, M_PI * 1.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_LEFT:
-      cairo_translate (cr, x+width+1, y);
+      cairo_translate (cr, x + width, y);
       cairo_rotate (cr, M_PI * 0.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_TOP:
-      cairo_translate (cr, x+width, y+height+1);
-      cairo_rotate (cr, M_PI);
+      cairo_translate (cr, x, y + height);
+      cairo_scale (cr, 1., -1.);
       break;
     default:
-      cairo_translate (cr, x, y-1);
+      cairo_translate (cr, x, y);
       break;
   }
-
-  height -= SIDE_SPACE;
-
+  float s = OBTAIN_THICKNESS (bg->panel_angle, bg->thickness);
+
+  height -= (s + PADDING_BOTTOM + 1.);
   /* Basic set-up */
   cairo_set_line_width (cr, 1.0);
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_translate (cr, 0.5, 0.5);
-
-  /* Draw the background (in black color*/
-  cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
-
-  for(i=SIDE_SPACE-1; i>-1; i--)
-  {
-    draw_rect_path (bg, cr, 0, i,  width, height, 0.5);
-    cairo_fill (cr);
-  }
+  cairo_translate (cr, DRAW_XPADDING, 0.5);
+  width -= DRAW_XPADDING * 2.;
+
+  /* Draw the background (in black color) */
+  cairo_set_source_rgba(cr, 0., 0., 0., 1.);
+  /* for shape mask draw only top and bottom plane */
+  Point3 *vertices = calc_points (bg, 0., 0., width, height);
+  draw_rect_path (cr, vertices, 0.);
+  cairo_fill (cr);
+  draw_rect_path (cr, vertices, s);
+  cairo_fill (cr);
+  free (vertices);
 
   cairo_restore (cr);
 }

=== modified file 'src/awn-background-edgy.c'
--- src/awn-background-edgy.c	2010-03-07 18:38:07 +0000
+++ src/awn-background-edgy.c	2010-07-16 11:56:43 +0000
@@ -16,6 +16,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  Author : Michal Hruby <[e-mail]>
+ *  Adjusted by: Alberto Aldegheri <[e-mail]>
  *
  */
 
@@ -106,7 +107,8 @@
 static void
 awn_background_edgy_align_changed (AwnBackgroundEdgy *bg) // has more params...
 {
-  gfloat align = awn_background_get_panel_alignment (AWN_BACKGROUND (bg));
+  AwnBackground *abg = AWN_BACKGROUND (bg);
+  gfloat align = awn_background_get_panel_alignment (abg);
   gboolean in_corner = align == 0.0 || align == 1.0;
   if (bg->priv->in_corner != in_corner)
   {
@@ -120,21 +122,27 @@
     else
     {
       gtk_widget_hide (bg->priv->separator);
-      awn_background_emit_padding_changed (AWN_BACKGROUND (bg));
+      awn_background_emit_padding_changed (abg);
     }
   }
 
   if (in_corner)
   {
     AwnAppletManager *manager;
-    g_object_get (AWN_BACKGROUND (bg)->panel, "applet-manager", &manager, NULL);
+    g_object_get (abg->panel, "applet-manager", &manager, NULL);
     awn_applet_manager_add_widget (manager, bg->priv->separator,
                                    awn_background_edgy_separator_pos (bg, align));
-    awn_background_emit_padding_changed (AWN_BACKGROUND (bg));
+    awn_background_emit_padding_changed (abg);
   }
 }
 
 static void
+awn_background_edgy_widgets_changed (AwnBackground *bg)
+{
+  awn_background_emit_padding_changed (bg);
+}
+
+static void
 awn_background_edgy_constructed (GObject *object)
 {
   G_OBJECT_CLASS (awn_background_edgy_parent_class)->constructed (object);
@@ -152,7 +160,11 @@
 
   AwnAppletManager *manager;
   g_object_get (panel, "applet-manager", &manager, NULL);
+  g_return_if_fail (manager);
   awn_applet_manager_add_widget (manager, bg->priv->separator, 1);
+  g_signal_connect_swapped (manager, "applets-refreshed",
+                      G_CALLBACK (awn_background_edgy_widgets_changed), bg);
+
 
   gpointer monitor = NULL;
   g_object_get (panel, "monitor", &monitor, NULL);
@@ -196,6 +208,12 @@
 
   GtkWidget *widget = AWN_BACKGROUND_EDGY_GET_PRIVATE (object)->separator;
 
+  if (manager)
+  {
+    g_signal_handlers_disconnect_by_func (manager, 
+        G_CALLBACK (awn_background_edgy_widgets_changed), object);
+  }
+
   if (manager && widget)
   {
     awn_applet_manager_remove_widget (manager, widget);
@@ -276,7 +294,6 @@
 
   /* Basic set-up */
   cairo_set_line_width (cr, 1.0);
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
   if (gtk_widget_is_composited (GTK_WIDGET (bg->panel)) == FALSE)
   {
@@ -313,6 +330,7 @@
   draw_path(cr, height - 1.0, width, height, bottom_left);
   cairo_line_to (cr, bottom_left ? 0.0 : width, height);
   cairo_clip (cr);
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source (cr, pat);
   cairo_paint (cr);
 
@@ -320,12 +338,17 @@
 
   cairo_pattern_destroy (pat);
 
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
   /* Draw the hi-light */
+
   pat = cairo_pattern_create_radial (bottom_left ? 0 : width, height,
                                      height * 3/4,
                                      bottom_left ? 0 : width, height,
                                      height);
-  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_histep_2);
+  double red, green, blue, alpha;
+  desktop_agnostic_color_get_cairo_color (bg->g_histep_2, &red, &green, &blue, &alpha);
+  cairo_pattern_add_color_stop_rgba (pat, 0.0, red, green, blue, 0.);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.2, bg->g_histep_2);
   awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_histep_1);
 
   draw_path (cr, height * 3/4, width, height, bottom_left);
@@ -359,50 +382,25 @@
                                           guint *padding_left,
                                           guint *padding_right)
 {
-  if (AWN_BACKGROUND_EDGY (bg)->priv->in_corner == FALSE)
-  {
-    /* if we're not in the corner behave as standard flat bg */
-    AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)->padding_request (
-      bg, position, padding_top, padding_bottom, padding_left, padding_right);
-    return;
-  }
-
-  gint base_side_pad, zero_pad = 0;
-  guint dummy, left, right;
-
+  /* behave as standard flat bg */
   AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)->padding_request (
-      bg, GTK_POS_BOTTOM, &dummy, &dummy, &left, &right);
-  base_side_pad = MAX (left, right);
+    bg, position, padding_top, padding_bottom, padding_left, padding_right);
 
   const gint req = AWN_BACKGROUND_EDGY (bg)->priv->top_pad;
-  gboolean bottom_left = awn_background_get_panel_alignment (bg) == 0.0;
-
-  if (awn_background_do_rtl_swap (bg))
-  {
-    zero_pad = base_side_pad;
-    base_side_pad = 0;
-  }
-
+
+  /* set the top padding for background */
   switch (position)
   {
     case GTK_POS_TOP:
       *padding_top  = 0; *padding_bottom = req;
-      *padding_left = bottom_left ? zero_pad : base_side_pad;
-      *padding_right = bottom_left ? base_side_pad : zero_pad;
       break;
     case GTK_POS_BOTTOM:
       *padding_top  = req; *padding_bottom = 0;
-      *padding_left = bottom_left ? zero_pad : base_side_pad;
-      *padding_right = bottom_left ? base_side_pad : zero_pad;
       break;
     case GTK_POS_LEFT:
-      *padding_top  = bottom_left ? zero_pad : base_side_pad;
-      *padding_bottom = bottom_left ? base_side_pad : zero_pad;
       *padding_left = 0; *padding_right = req;
       break;
     case GTK_POS_RIGHT:
-      *padding_top  = bottom_left ? zero_pad : base_side_pad;
-      *padding_bottom = bottom_left ? base_side_pad : zero_pad;
       *padding_left = req; *padding_right = 0;
       break;
     default:
@@ -437,7 +435,7 @@
   AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)->padding_request (
     bg, position, &top, &bot, &left, &right);
   const gint modifier = AWN_BACKGROUND_EDGY (bg)->priv->top_pad;
-  
+
   switch (position)
   {
     case GTK_POS_RIGHT:
@@ -458,83 +456,84 @@
   }
 }
 
-static void
-awn_background_edgy_prepare_context (AwnBackgroundEdgy *bg,
-                                     cairo_t        *cr,
-                                     GtkPositionType  position,
-                                     GdkRectangle   *area,
-                                     gint *width_ptr, gint *height_ptr)
+static gboolean
+awn_background_edgy_flat_needed (AwnBackground *bg, gint width)
+{
+  gboolean expand = FALSE;
+  g_object_get (bg->panel, "expand", &expand, NULL);
+  if (expand || !AWN_BACKGROUND_EDGY (bg)->priv->in_corner)
+  {
+    return TRUE;
+  }
+  return width > AWN_BACKGROUND_EDGY (bg)->priv->radius * 4/3;
+}
+
+static void 
+awn_background_edgy_get_shape_mask (AwnBackground  *bg,
+                                    cairo_t        *cr, 
+                                    GtkPositionType  position,
+                                    GdkRectangle   *area)
 {
   gint temp;
   gint x = area->x, y = area->y;
   gint width = area->width, height = area->height;
+  const gboolean in_corner = AWN_BACKGROUND_EDGY (bg)->priv->in_corner;
+
+  if (awn_background_edgy_flat_needed (bg, width))
+  {
+    GdkRectangle areaf = {x, y, width, height};
+    cairo_save (cr);
+    awn_background_edgy_translate_for_flat (bg, position, &areaf);
+    AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)-> get_shape_mask (
+                                                    bg, cr, position, &areaf);
+    cairo_restore (cr);
+  }
+  if (!in_corner)
+  {
+    return;
+  }
+  cairo_save (cr);
 
   switch (position)
   {
     case GTK_POS_RIGHT:
-      cairo_translate (cr, x, y);
-      cairo_rotate (cr, M_PI * 0.5);
-      cairo_scale (cr, 1.0, -1.0);
+      height += y;
+      cairo_translate (cr, 0., height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
+      cairo_rotate (cr, M_PI * 1.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_LEFT:
-      cairo_translate (cr, x+width, y);
+      height += y;
+      cairo_translate (cr, x + width, 0.);
       cairo_rotate (cr, M_PI * 0.5);
       temp = width;
-      width = height; height = temp;
+      width = height;
+      height = temp;
       break;
     case GTK_POS_TOP:
-      cairo_translate (cr, x, height - y);
-      cairo_scale (cr, 1.0, -1.0);
+      width += x;
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
       break;
     default:
-      cairo_translate (cr, x, y);
+      width += x;
+      cairo_translate (cr, 0., y);
       break;
   }
-
-  if (width_ptr) *width_ptr = width;
-  if (height_ptr) *height_ptr = height;
-}
-
-static void 
-chain_draw (AwnBackground  *bg,
-            cairo_t        *cr, 
-            GtkPositionType  position,
-            GdkRectangle   *area)
-{
-  cairo_save (cr);
-
-  if (AWN_BACKGROUND_EDGY (bg)->priv->in_corner)
-  {
-    /* we need to clip the drawing area of flat background */
-    gint width, height;
-
-    gfloat align = awn_background_get_panel_alignment (AWN_BACKGROUND (bg));
-    gboolean bottom_left = align == 0.0;
-
-    cairo_rectangle (cr, area->x, area->y, area->width, area->height);
-
-    /* init our context - translate, rotate.. */
-    awn_background_edgy_prepare_context (AWN_BACKGROUND_EDGY (bg), cr,
-                                         position, area, &width, &height);
-
-    cairo_move_to (cr, bottom_left ? 0.0 : width, height);
-    draw_path (cr, height - 1.0, width, height, bottom_left);
-    cairo_line_to (cr, bottom_left ? 0.0 : width, height);
-
-    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
-    cairo_clip (cr);
-
-    /* prepare context for base class call */
-    cairo_identity_matrix (cr);
-    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
-
-    awn_background_edgy_translate_for_flat (bg, position, area);
-  }
-
-  AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)-> draw (
-    bg, cr, position, area);
+  
+  /* Basic set-up */
+  cairo_set_line_width (cr, 1.0);
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  gboolean bottom_left = awn_background_get_panel_alignment (bg) == 0.;
+  draw_path(cr, height - 1.0, width, height, bottom_left);
+  cairo_line_to (cr, bottom_left ? 0.0 : width, height);
+  cairo_set_source_rgba (cr, 0., 0., 0., 1.);
+  cairo_clip (cr);
+  cairo_paint (cr);
 
   cairo_restore (cr);
 }
@@ -545,73 +544,56 @@
                           GtkPositionType  position,
                           GdkRectangle   *area)
 {
-  const gboolean in_corner = AWN_BACKGROUND_EDGY (bg)->priv->in_corner;
-  gint base_size = area->width;
-
-  if (in_corner)
-  {
-    gint width, height;
-
-    cairo_save (cr);
-
-    /* init our context - translate, rotate.. */
-    awn_background_edgy_prepare_context (AWN_BACKGROUND_EDGY (bg),
-                                         cr, position, area, &width, &height);
-
-    draw_top_bottom_background (bg, cr, width, height);
-
-    cairo_restore (cr);
-
-    base_size = width;
-  }
-
-  if (!in_corner || base_size > AWN_BACKGROUND_EDGY (bg)->priv->radius * 4/3)
-    chain_draw (bg, cr, position, area);
-}
-
-static void 
-awn_background_edgy_get_shape_mask (AwnBackground  *bg,
-                                    cairo_t        *cr, 
-                                    GtkPositionType  position,
-                                    GdkRectangle   *area)
-{
-  const gboolean in_corner = AWN_BACKGROUND_EDGY (bg)->priv->in_corner;
-  gint base_size = area->width;
-
-  if (in_corner)
-  {
-    gint width, height;
-
-    cairo_save (cr);
-
-    gfloat align = awn_background_get_panel_alignment (AWN_BACKGROUND (bg));
-    gboolean bottom_left = align == 0.0;
-
-    /* init our context - translate, rotate.. */
-    awn_background_edgy_prepare_context (AWN_BACKGROUND_EDGY (bg),
-                                         cr, position, area, &width, &height);
-
-    draw_path (cr, height - 1.0, width, height, bottom_left);
-    cairo_line_to (cr, bottom_left ? 0.0 : width, height);
-
-    cairo_fill_preserve (cr);
-    cairo_stroke (cr);
-
-    cairo_restore (cr);
-
-    base_size = width;
-
-    /* prepare context for base class call */
-    awn_background_edgy_translate_for_flat (bg, position, area);
-  }
-
-  if (!in_corner || base_size > AWN_BACKGROUND_EDGY (bg)->priv->radius * 4/3)
-  {
-    cairo_set_operator (cr, CAIRO_OPERATOR_ADD);
-
-    AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)->get_shape_mask (
-      bg, cr, position, area);
-  }
+  gint temp;
+  gint x = area->x, y = area->y;
+  gint width = area->width, height = area->height;
+
+  if (awn_background_edgy_flat_needed (bg, width))
+  {
+    GdkRectangle areaf = {x, y, width, height};
+    cairo_save (cr);
+    awn_background_edgy_translate_for_flat (bg, position, &areaf);
+    AWN_BACKGROUND_CLASS (awn_background_edgy_parent_class)-> draw (
+      bg, cr, position, &areaf);
+    cairo_restore (cr);
+  }
+
+  cairo_save (cr);
+
+  switch (position)
+  {
+    case GTK_POS_RIGHT:
+      height += y;
+      cairo_translate (cr, 0., height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
+      cairo_rotate (cr, M_PI * 1.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_LEFT:
+      height += y;
+      cairo_translate (cr, x + width, 0.);
+      cairo_rotate (cr, M_PI * 0.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_TOP:
+      width += x;
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      break;
+    default:
+      width += x;
+      cairo_translate (cr, 0., y);
+      break;
+  }
+  
+  draw_top_bottom_background (bg, cr, width, height);
+
+  cairo_restore (cr);
 }
 
 /* vim: set et ts=2 sts=2 sw=2 : */

=== modified file 'src/awn-background-flat.c'
--- src/awn-background-flat.c	2010-05-23 23:07:18 +0000
+++ src/awn-background-flat.c	2010-07-16 11:56:43 +0000
@@ -159,22 +159,14 @@
   if (expand){ state = ROUND_NONE; x-=2; width+=4; }
   else
   {
-    switch (position)
-    {
-      case GTK_POS_BOTTOM:
-      case GTK_POS_LEFT:
-        if (align == 0.0f){ state = ROUND_TOP_RIGHT; x-=2; width+=2; }
-        else if(align == 1.0f){ state = ROUND_TOP_LEFT; width+=2; }
-        break;
-      case GTK_POS_TOP:
-      case GTK_POS_RIGHT:
-        if (align == 0.0f){ state = ROUND_TOP_LEFT; width+=2; }
-        else if(align == 1.0f){ state = ROUND_TOP_RIGHT; x-=2; width+=2; }
-        break;
-      default:
-        break;
-    }
-
+    if (align == 0.0f)
+    {
+      state = ROUND_TOP_RIGHT; x-=2; width+=2;
+    }
+    else if(align == 1.0f)
+    {
+      state = ROUND_TOP_LEFT; width+=2;
+    }
   }
 
   awn_cairo_rounded_rect (cr, x, y, width, height, bg->corner_radius, state);
@@ -224,7 +216,7 @@
   cairo_save (cr);
 
   draw_rect (bg, cr, position, 1, 1, width-3, height-1, align, expand);
-  cairo_clip (cr);
+  cairo_clip_preserve (cr);
   cairo_set_source (cr, pat);
   cairo_paint (cr);
 
@@ -233,10 +225,12 @@
   cairo_pattern_destroy (pat);
 
   /* Draw the hi-light */
-  pat = cairo_pattern_create_linear (0, 0, 0, (height/3.0));
+  pat = cairo_pattern_create_linear (0, 0, 0, height);
   awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_histep_1);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_histep_2);
-  draw_rect (bg, cr, position, 1, 1, width-3, height/3.0, align, expand);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.3, bg->g_histep_2);
+  double red, green, blue, alpha;
+  desktop_agnostic_color_get_cairo_color (bg->g_histep_2, &red, &green, &blue, &alpha);
+  cairo_pattern_add_color_stop_rgba (pat, 0.36, red, green, blue, 0.);
 
   cairo_set_source (cr, pat);
   cairo_fill (cr);

=== modified file 'src/awn-background-floaty.c'
--- src/awn-background-floaty.c	2010-05-31 17:41:58 +0000
+++ src/awn-background-floaty.c	2010-07-16 11:56:43 +0000
@@ -181,7 +181,7 @@
   cairo_save (cr);
 
   draw_rect (bg, cr, position, 1, 1, width-3, bg_size-2, TRUE);
-  cairo_clip (cr);
+  cairo_clip_preserve (cr);
   cairo_set_source (cr, pat);
   cairo_paint (cr);
 
@@ -190,10 +190,12 @@
   cairo_pattern_destroy (pat);
 
   /* Draw the hi-light */
-  pat = cairo_pattern_create_linear (0, 0, 0, (bg_size/3.0));
+  pat = cairo_pattern_create_linear (0., 0., 0., height);
   awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_histep_1);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_histep_2);
-  draw_rect (bg, cr, position, 1, 1, width-3, bg_size/3.0, FALSE);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.3, bg->g_histep_2);
+  double red, green, blue, alpha;
+  desktop_agnostic_color_get_cairo_color (bg->g_histep_2, &red, &green, &blue, &alpha);
+  cairo_pattern_add_color_stop_rgba (pat, 0.36, red, green, blue, 0.);
 
   cairo_set_source (cr, pat);
   cairo_fill (cr);

=== modified file 'src/awn-background-lucido.c'
--- src/awn-background-lucido.c	2010-05-31 22:40:18 +0000
+++ src/awn-background-lucido.c	2010-07-16 11:56:43 +0000
@@ -17,7 +17,7 @@
  *
  *  Author : Alberto Aldegheri <[e-mail]>
  *  Thanks to: Matt <[e-mail]>
- *             for the code section to analyze expanders
+ *             for the code section to analyze separators
  *
  */
 
@@ -39,11 +39,27 @@
 
 struct _AwnBackgroundLucidoPrivate
 {
-  gint expw;
-  gint expn;
+  gint      expw;
+  gfloat    lastx;
+  gfloat    lastxend;
+  GArray   *pos;
+  gint      pos_size;
+  guint     tid;
+  gboolean  needs_animation;
 };
 
-#define TRANSFORM_RADIUS(x) sqrt(x/50.)*50.
+#define TOP_PADDING 2
+/* Timeout for animation -> 40 = 25fps*/
+#define ANIM_TIMEOUT 40
+/* ANIMATION SPEED needs to be greater than 0. - Lower values are faster */
+#define ANIMATION_SPEED 16.
+
+/* draw shape mask for debug */
+#define DEBUG_SHAPE_MASK      FALSE
+
+#define TRANSFORM_RADIUS(x) MAX(sqrt(x/60.)*60.,1)
+
+#define IS_SPECIAL(x) AWN_IS_SEPARATOR(x)
 
 static void awn_background_lucido_draw (AwnBackground  *bg,
                                         cairo_t        *cr,
@@ -61,18 +77,31 @@
                                                    guint *padding_bottom,
                                                    guint *padding_left,
                                                    guint *padding_right);
-                                                   
+
 static gboolean
 awn_background_lucido_get_needs_redraw (AwnBackground *bg,
                                         GtkPositionType position,
                                         GdkRectangle *area);
-                                        
+
+
+static void 
+_set_special_widget_width_and_transparent (AwnBackground *bg,
+                                           gint          width,
+                                           gboolean      transp,
+                                           gboolean      dispose);
+
 static void 
 awn_background_lucido_corner_radius_changed (AwnBackground *bg)
 {
   gboolean expand = FALSE;
   g_object_get (bg->panel, "expand", &expand, NULL);
-  
+
+  _set_special_widget_width_and_transparent (
+                                        bg,
+                                        TRANSFORM_RADIUS (bg->corner_radius),
+                                        TRUE,
+                                        FALSE);
+
   if (!expand)
   {
     awn_background_emit_padding_changed (bg);
@@ -92,19 +121,28 @@
 }
 
 static void
+awn_background_lucido_applets_refreshed (AwnBackground *bg)
+{
+  _set_special_widget_width_and_transparent 
+                  (bg, TRANSFORM_RADIUS (bg->corner_radius), TRUE, FALSE);
+  awn_background_emit_changed (bg);
+}
+
+static void
 awn_background_lucido_constructed (GObject *object)
 {
   G_OBJECT_CLASS (awn_background_lucido_parent_class)->constructed (object);
-  
+
   AwnBackground *bg = AWN_BACKGROUND (object);
   gpointer monitor = NULL;
-  
+
   g_signal_connect_swapped (bg, "notify::corner-radius",
-                            G_CALLBACK (awn_background_lucido_corner_radius_changed),
+                            G_CALLBACK (
+                            awn_background_lucido_corner_radius_changed),
                             object);
 
   g_return_if_fail (bg->panel);
-  
+
   g_signal_connect_swapped (bg->panel, "notify::expand",
                             G_CALLBACK (awn_background_lucido_expand_changed),
                             object);
@@ -116,11 +154,24 @@
   g_signal_connect_swapped (monitor, "notify::monitor-align",
                             G_CALLBACK (awn_background_lucido_align_changed),
                             object);
+
+  AwnAppletManager *manager = NULL;
+  g_object_get (bg->panel, "applet-manager", &manager, NULL);
+  g_return_if_fail (manager);
+  g_signal_connect_swapped (manager, "applets-refreshed",
+                      G_CALLBACK (awn_background_lucido_applets_refreshed), bg);
 }
 
 static void
 awn_background_lucido_dispose (GObject *object)
 {
+  _set_special_widget_width_and_transparent 
+                          (AWN_BACKGROUND (object), 10, FALSE, TRUE);
+
+  AwnBackgroundLucido *lbg = AWN_BACKGROUND_LUCIDO (object);
+  AwnBackgroundLucidoPrivate *priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (lbg);
+  g_array_free (priv->pos, TRUE);
+
   gpointer monitor = NULL;
   if (AWN_BACKGROUND (object)->panel)
   {
@@ -139,6 +190,15 @@
   g_signal_handlers_disconnect_by_func (AWN_BACKGROUND (object), 
         G_CALLBACK (awn_background_lucido_corner_radius_changed), object);
 
+  AwnAppletManager *manager = NULL;
+  g_object_get (AWN_BACKGROUND (object)->panel,
+                                "applet-manager", &manager, NULL);
+  if (manager)
+  {
+    g_signal_handlers_disconnect_by_func (manager, 
+        G_CALLBACK (awn_background_lucido_applets_refreshed), object);
+  }
+
   G_OBJECT_CLASS (awn_background_lucido_parent_class)->dispose (object);
 }
 
@@ -151,19 +211,30 @@
   obj_class->constructed  = awn_background_lucido_constructed;
   obj_class->dispose = awn_background_lucido_dispose;
 
+#if DEBUG_SHAPE_MASK
+  bg_class->draw = awn_background_lucido_get_shape_mask;
+#else
   bg_class->draw = awn_background_lucido_draw;
+#endif
   bg_class->padding_request = awn_background_lucido_padding_request;
   bg_class->get_shape_mask = awn_background_lucido_get_shape_mask;
   bg_class->get_input_shape_mask = awn_background_lucido_get_shape_mask;
   bg_class->get_needs_redraw = awn_background_lucido_get_needs_redraw;
-  
+
   g_type_class_add_private (obj_class, sizeof (AwnBackgroundLucidoPrivate));
 }
 
 static void
 awn_background_lucido_init (AwnBackgroundLucido *bg)
 {
-
+  AwnBackgroundLucidoPrivate *priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (bg);
+  priv->lastx = 0;
+  priv->lastxend = INT_MAX;
+  priv->needs_animation = FALSE;
+  priv->tid = 0;
+  priv->pos = g_array_new (FALSE, TRUE, sizeof (gfloat));
+  priv->pos_size = 0;
+  awn_background_lucido_applets_refreshed (AWN_BACKGROUND (bg));
 }
 
 AwnBackground *
@@ -179,6 +250,66 @@
   return bg;
 }
 
+/* ANIMATION FUNCTIONS */
+
+/*
+ * _add_n_positions:
+ * adds n positions to position array that contains
+ * last positions of special applets
+ * Usually called when a special applet is added
+ */
+static void
+_add_n_positions (AwnBackgroundLucidoPrivate *priv, gint n, gfloat startpos)
+{
+  while (n-- > 0)
+  {
+    g_array_append_val (priv->pos, startpos);
+    ++priv->pos_size;
+  }  
+}
+
+/*
+ * awn_background_lucido_redraw:
+ * @lbg: the lucido background ojbect
+ *
+ * Queue redraw of the panel and repeat itself if needed
+ */
+static gboolean
+awn_background_lucido_redraw (AwnBackgroundLucido *lbg)
+{
+  g_return_val_if_fail (AWN_IS_BACKGROUND_LUCIDO (lbg), FALSE);
+
+  AwnBackgroundLucidoPrivate *priv;
+  AwnBackground *bg = AWN_BACKGROUND (lbg);
+  priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (lbg);
+
+  if (priv->needs_animation)
+  {
+    awn_background_invalidate (bg);
+    gtk_widget_queue_draw (GTK_WIDGET (bg->panel));
+    return TRUE;
+  }
+  else
+  {
+    priv->tid = 0;
+    return FALSE;
+  }
+}
+
+/*
+ * _restart_timeout:
+ * restarts animation's timer if needed
+ */
+static void _restart_timeout (AwnBackground *bg,
+                              AwnBackgroundLucidoPrivate *priv)
+{
+  priv->needs_animation = TRUE;
+  if (!priv->tid)
+  {
+    priv->tid = g_timeout_add (ANIM_TIMEOUT, (GSourceFunc)awn_background_lucido_redraw, bg);
+  }
+}
+
 /*
  * Drawing functions
  */
@@ -202,6 +333,10 @@
   *ys = yf;
 }
 
+/*
+ * Gets applet manager's childs.
+ * Sets docklet mode = TRUE if panel is in docklet mode
+ */
 static GList*
 _get_applet_widgets (AwnBackground* bg)
 {
@@ -211,6 +346,58 @@
   return gtk_container_get_children (GTK_CONTAINER (manager));
 }
 
+/*
+ * Get applet manager size
+ * Get offset-left stored in "x" variable passed to method
+ *
+ */
+static gint
+_get_applet_manager_size (AwnBackground* bg, GtkPositionType position, float *x)
+{
+  AwnAppletManager *manager = NULL;
+  g_object_get (bg->panel, "applet-manager", &manager, NULL);
+  GtkWidget *widget = GTK_WIDGET (manager);
+  gint wx, wy;
+  gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget),
+                                       0, 0, &wx, &wy);
+  switch (position)
+  {
+    case GTK_POS_BOTTOM:
+    case GTK_POS_TOP:
+      if (x)
+        *x = wx;
+      return widget->allocation.width;
+      break;
+    default:
+      if (x)
+        *x = wy;
+      return widget->allocation.height;
+      break;
+  }
+}
+
+/*
+ * coord_get_near:
+ * @from: the current position
+ * @to: the target position
+ * @return: a position between "from" and "to", if distance = 1, returns "to" 
+ */
+static float
+coord_get_near (const gfloat from, const gfloat to)
+{
+  float inc = abs (to - from);
+  float step = inc / ANIMATION_SPEED + 1.; // makes the resize shiny
+  inc = MIN (inc, step);
+  if (to > from)
+  {
+    return lroundf (from + inc);
+  }
+  else
+  {
+    return lroundf (from - inc);
+  }
+}
+
 /**
  * _create_path_lucido:
  * @bg: The background pointer
@@ -219,21 +406,23 @@
  * @y: The top left coordinate of the "bar rect" - default = 0
  * @w: The width of the bar
  * @h: The height of the bar
- * @stripe: The width of the stripe (0.0-1.0). Zero for auto-stripe.
  * @d: The width of each curve in the path
  * @dc: The width of the external curves in non-expanded&auto mode
- * @symmetry: The symmetry of the stripe when @stripe > 0
  * @internal: If Zero, creates the path for the stripe
  * @expanded: If Zero, the bar is not expanded
+ * @align: the monitor align
+ * @update_positions: if FALSE it uses positions stored in priv->pos,
+ *                    otherwise updates the position stored in priv->pos
  *
  * This function creates paths on which the bar will be drawn.
- * In atuo-stripe, it searchs for expanders applet, each expander
+ * In atuo-stripe, it searchs for separators applet, each separator
  * equals to one curve.
- * If the first widget is an expander, start from bottom-left,
+ * If the first widget is an separator, start from bottom-left,
  * otherwise start from top-left
+ *
+ * returns the calculated y coordinate to draw the gradient
  */
-
-static void
+static gfloat
 _create_path_lucido ( AwnBackground*  bg,
                       GtkPositionType position,
                       cairo_t*        cr,
@@ -241,371 +430,360 @@
                       gfloat          y,
                       gfloat          w,
                       gfloat          h,
-                      gfloat          stripe,
                       gfloat          d,
                       gfloat          dc,
-                      gfloat          symmetry,
                       gboolean        internal,
                       gboolean        expanded,
-                      gfloat          align)
+                      gfloat          align,
+                      gboolean        update_positions)
 {
-  cairo_new_path (cr);
+  AwnBackgroundLucido *lbg = AWN_BACKGROUND_LUCIDO (bg);
+  AwnBackgroundLucidoPrivate *priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (lbg);
+  gfloat applet_manager_x = 0.;
+  _get_applet_manager_size (bg, position, &applet_manager_x);
+  gboolean needs_animation = FALSE;
 
+  /****************************************************************************/
+  /********************     UPDATE STARTING POINT     *************************/
+  /****************************************************************************/
+  /* x variable stores the starting x point for draw the panel */
+  if (update_positions)
+  {
+    if (!expanded)
+    {
+      x += applet_manager_x - dc;
+    }
+    x = lroundf (x);
+    if (x != priv->lastx)
+    {
+      needs_animation = TRUE;
+    }
+    x = coord_get_near (priv->lastx, x);
+    priv->lastx = x;
+  }
+  else
+  {
+    x = priv->lastx;
+  }
+  /****************************************************************************/
+  /********************     INIT GENERAL COORDINATES  *************************/
+  /****************************************************************************/
+  gfloat sym = bg->curves_symmetry;
+  gfloat curx = x;
   gfloat lx = x;
   gfloat ly = y;
   gfloat y3 = y + h;
-  gfloat y2 = y3 - 5;
-  
-  if (stripe > 0)
-  {
-    if (expanded)
-    {
-      stripe = (w * stripe); /* now stripe = non-stripe */
+  gfloat y2 = y3 - 8. * bg->thickness;
+  gfloat rdc = dc;
+
+  /****************************************************************************/
+  /********************     CURVES SYMMETRY HANDLER   *************************/
+  /****************************************************************************/
+  sym = fabs (sym - 0.5);
+  gfloat exty = y + h * sym * 2.;
+  if (exty > y2)
+  {
+    y2 = exty;
+  }
+  if (internal && bg->curves_symmetry > 0.5)
+  {
+    y = exty;
+  }
+  else if (!internal && bg->curves_symmetry < 0.5)
+  {
+    y = exty;
+  }
+  /****************************************************************************/
+  /********************     OBTAIN LIST OF APPLETS    *************************/
+  /****************************************************************************/
+  gboolean docklet_mode = awn_panel_get_docklet_mode (bg->panel);
+  GList *widgets = _get_applet_widgets (bg);
+  GList *i = widgets;
+  GtkWidget *widget = NULL;
+  /* j = index of last special widget found */
+  gint j = -1;
+  /* Check for docklet mode - In docklet mode first widget is the docklet */
+  if (i && docklet_mode)
+  {
+    i = i->next;
+  }
+  /* Check if the first widget is special */
+  gboolean first_widget_is_special = FALSE;
+  if (i && IS_SPECIAL (i->data))
+  {
+    first_widget_is_special = TRUE;
+  }
+  /****************************************************************************/
+  /********************     SETUP EXTERNAL CORNERS    *************************/
+  /****************************************************************************/
+  if (expanded)
+  {
+    dc = rdc = 0.;
+  }
+  else if (align == 0.)
+  {
+    dc = 0.;
+  }
+  else if (align == 1.)
+  {
+    rdc = 0.;
+  }
+  /****************************************************************************/
+  /********************        START THE PATH         *************************/
+  /****************************************************************************/
+  if (internal)
+  {
+    cairo_new_path (cr);
+    lx = lx + dc;
+    ly = y;
+    cairo_move_to (cr, lx, ly);
+    _line_from_to (cr, &lx, &ly, curx, y3);
+  }
+  else
+  {
+    cairo_new_path (cr);
+    lx = curx;
+    ly = y3;
+    cairo_move_to (cr, lx, ly);
+  }
+  /* check for special in first position */
+  if (first_widget_is_special)
+  {
+    i = i->next;
+    _line_from_to (cr, &lx, &ly, lx + dc, y2);
+  }
+  else if (!internal)
+  {
+    _line_from_to (cr, &lx, &ly, lx + dc, y);
+  }
+  else
+  {
+    _line_from_to (cr, &lx, &ly, lx + dc, exty);
+  }
+  /****************************************************************************/
+  /********************     UPDATE WIDTH FOR LAST X   *************************/
+  /****************************************************************************/
+  /* w stores the "right corner", lastxend equals to last w */
+  if (update_positions)
+  {
+    w = lroundf (w);
+    if (w != priv->lastxend)
+    {
+      needs_animation = TRUE;
+      gfloat neww = coord_get_near (priv->lastxend, w);
+      w = MIN (w, neww);
+      priv->lastxend = w;
+    }
+  }
+  else
+  {
+    w = priv->lastxend;
+  }
+  /****************************************************************************/
+  /********************        LOOP ON APPLETS        *************************/
+  /****************************************************************************/
+  gfloat saved_y = y;
+  if (bg->curves_symmetry < 0.5)
+  {
+    y = exty;
+  }
+  curx = lx;
+  gint wx, wy;
+  if (!docklet_mode)
+  {
+    for (; i; i = i->next)
+    {
+      widget = GTK_WIDGET (i->data);
+      if (!IS_SPECIAL (widget)) 
+      {
+        /* if not special continue */
+        continue;
+      }
+      /* special found, obtain coordinates */
+      ++j;
+      gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget),
+                                       0, 0, &wx, &wy);
+      switch (position)
+      {
+        case GTK_POS_BOTTOM:
+        case GTK_POS_TOP:
+          curx = wx;
+          break;
+        default:
+          curx = wy;
+          break;
+      }
+      if (priv->pos_size <= j)
+      {
+        /* New special applet found, resize the array */
+        _add_n_positions (priv, 1, lx);
+      }
+      /************************************************************************/
+      /*****************    UPDATE SINGLE CURVE POSITION  *********************/
+      /************************************************************************/
+      if (update_positions)
+      {
+        curx = lroundf (curx);
+        if (curx != g_array_index (priv->pos, gfloat, j))
+        {
+          needs_animation = TRUE;
+        }
+        curx = coord_get_near (g_array_index (priv->pos, gfloat, j), curx);
+        if (curx > (w - rdc - d))
+        {
+          curx = w - rdc - d;
+        }
+        g_array_index (priv->pos, gfloat, j) = curx;
+      }
+      else
+      {
+        curx = g_array_index (priv->pos, gfloat, j);
+      }
+      if (curx < 0)
+      {
+        continue;
+      }
+      _line_from_to (cr, &lx, &ly, curx, ly);
+      if (ly == y2)
+      {
+        _line_from_to (cr, &lx, &ly, lx + d, y);
+      }
+      else
+      {
+        _line_from_to (cr, &lx, &ly, lx + d, y2);
+      }
+    }
+  }
+  y = saved_y;
+  g_list_free (widgets);
+  /****************************************************************************/
+  /************************     CLOSE THE PATH   ******************************/
+  /****************************************************************************/
+  if (expanded)
+  {
+    /* make sure that cairo close path in the right way */
+    _line_from_to (cr, &lx, &ly, w, ly);
+    if (internal)
+    {
+      _line_from_to (cr, &lx, &ly, lx, y);
+    }
+    else
+    {
+      _line_from_to (cr, &lx, &ly, lx, y3);
+    }
+  }
+  else
+  {
+    if (align == 1.)
+    {
       if (internal)
       {
-        /* Manual-Stripe & Expanded & Internal */
-        lx = stripe * symmetry;
-        cairo_move_to (cr, lx, ly);
-        _line_from_to (cr, &lx, &ly, lx+d, y2);
-        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - d, y2);
-        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry), y);
-        cairo_close_path (cr);
-      }
-      else
-      {
-        /* Manual-Stripe & Expanded & External */
-        ly = y3;
-        cairo_move_to (cr, lx, ly);
+        _line_from_to (cr, &lx, &ly, w, ly);
         _line_from_to (cr, &lx, &ly, lx, y);
-        _line_from_to (cr, &lx, &ly, stripe * symmetry, y);
-        _line_from_to (cr, &lx, &ly, stripe * symmetry + d, y2);
-        _line_from_to (cr, &lx, &ly, w - stripe * (1. - symmetry) - d, y2);
-        _line_from_to (cr, &lx, &ly, w - stripe * (1. - symmetry), y);
-        _line_from_to (cr, &lx, &ly, w, y);
-        _line_from_to (cr, &lx, &ly, w, y3);
-        cairo_close_path (cr);
-      }
-    }    
-    else
-    {
-      if (stripe == 1.)
-      {
-        _create_path_lucido (bg, position, cr, x, y, w, h, 0., 
-                             d, dc, 0., internal, expanded, align);
-        return;
-      }
-      stripe = ((w - dc * 2) * stripe); /* now stripe = non-stripe */
-      if (internal)
-      {
-        /* Manual-Stripe & Not-Expanded & Internal */
-        lx = stripe * symmetry + dc;
-        cairo_move_to (cr, lx, ly);
-        _line_from_to (cr, &lx, &ly, lx + d, y2);
-        _line_from_to (cr, &lx, &ly, w - stripe * (1.- symmetry) - dc - d, y2);
-        _line_from_to (cr, &lx, &ly, w - stripe * (1.- symmetry) - dc, y);
-        cairo_close_path (cr);
-      }
-      else
-      {
-        /* Manual-Stripe & Not-Expanded & External */
-        ly = y3;
-        cairo_move_to (cr, lx, ly);
-        _line_from_to (cr, &lx, &ly, lx+dc, y);
-        _line_from_to (cr, &lx, &ly, stripe * symmetry + dc, y);
-        _line_from_to (cr, &lx, &ly, stripe * symmetry + d + dc, y2);
-        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - dc - d, y2);
-        _line_from_to (cr, &lx, &ly, w-stripe * (1. - symmetry) - dc, y);
-        _line_from_to (cr, &lx, &ly, w-dc, y);
-        _line_from_to (cr, &lx, &ly, w, y3);
-        cairo_close_path(cr);
-      }
-    }
-  }
-  else
-  {
-    gint exps_found = 0;
-    gfloat curx = x;
-    
-    if (expanded)
-    {
-      if (internal)
-      {        
-        /* Auto-Stripe & Expanded & Internal */
-        GList *widgets = _get_applet_widgets (bg);
-        GList *i = widgets;
-        GtkWidget *widget = NULL;
-        
-        /* analyze first widget*/
-        if (i)
-        {
-          widget = GTK_WIDGET (i->data);
-          
-          /* if first widget is an expander or align==0 || 1*/
-          if ( (widget && GTK_IS_IMAGE (widget) && !AWN_IS_SEPARATOR (widget) ) ||
-               ( align == 0. || align == 1. ) )
-          {
-            /* start from bottom */
-            lx = curx;
-            ly = y;
-            cairo_move_to (cr, lx, ly);
-            _line_from_to (cr, &lx, &ly, lx, y2);
-            ++exps_found;
-            if (align != 0. && align != 1.)
-              i = i->next;
-          }
-        }
-        /* else start from top */
-
-        for (; i; i = i->next)
-        {
-          widget = GTK_WIDGET (i->data);
-
-          if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget)) 
-          {
-            /* if not expander continue */
-            continue;
-          }          
-          /* expander found */
-          switch (position)
-          {
-            case GTK_POS_BOTTOM:
-            case GTK_POS_TOP:
-              curx = widget->allocation.x;
-              if (exps_found % 2 != 0)
-              {
-                curx += widget->allocation.width;
-              }
-              break;
-            default:
-              curx = widget->allocation.y;
-              if ( exps_found % 2 != 0)
-              {
-                curx += widget->allocation.height;
-              }
-              break;
-          }
-          if (curx < 0)
-          {
-            continue;
-          }
-
-          if (exps_found == 0)
-          {
-            /* this is the first expander */  
-            lx = curx;
-            cairo_move_to (cr, lx, ly);
-            _line_from_to (cr, &lx, &ly, curx + d, y2);
-          }
-          else
-          {
-            if (exps_found % 2 != 0)
-            {
-              /* odd expander - curve at the end of expander */
-              _line_from_to (cr, &lx, &ly, curx - d, y2);
-              if (i->next == NULL)
-                _line_from_to (cr, &lx, &ly, curx, y2);
-              _line_from_to (cr, &lx, &ly, curx, y);
-            }
-            else
-            {
-              /* even expander - curve at the start of expander */
-              _line_from_to (cr, &lx, &ly, curx, y);
-              _line_from_to (cr, &lx, &ly, curx + d, y2);
-              /* else the last widget is an expander */
-            }
-          }
-
-          ++exps_found;
-        }
-        g_list_free (widgets);
-
-        _line_from_to (cr, &lx, &ly, w, ly);
-
-        if (exps_found % 2 != 0)
-        {
-          _line_from_to (cr, &lx, &ly, lx, y);
-        }
-
-        cairo_close_path (cr);
-      }
-      else
-      {
-        /* Auto-Stripe & Expanded & External */
-
-        GList *widgets = _get_applet_widgets (bg);
-        GList *i = widgets;
-        GtkWidget *widget = NULL;
-        
-        /* analyze first widget*/
-        if (i)
-        {
-          widget = GTK_WIDGET (i->data);
-
-          ly = y3;
-          cairo_move_to (cr, lx, ly);
-
-          /* if first widget is an expander or align==0 || 1*/
-          if ( (widget && GTK_IS_IMAGE (widget) && !AWN_IS_SEPARATOR (widget) ) ||
-               ( align == 0. || align == 1. ) )
-          {
-            /* start from bottom */
-            _line_from_to (cr, &lx, &ly, lx, y2);
-            ++exps_found;
-            if (align != 0. && align != 1.)
-              i = i->next;
-          }
-          else
-          {
-            /* start from top */
-            _line_from_to (cr, &lx, &ly, lx, y);
-          }
-        }
-
-        for (; i; i = i->next)
-        {
-          widget = GTK_WIDGET (i->data);
-
-          if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget))
-          {
-            /* if not expander continue */
-            continue;
-          }
-          /* expander found */
-          switch (position)
-          {
-            case GTK_POS_BOTTOM:
-            case GTK_POS_TOP:
-              curx = widget->allocation.x;
-              if (exps_found % 2 != 0)
-              {
-                curx += widget->allocation.width;
-              }
-              break;
-            default:
-              curx = widget->allocation.y;
-              if (exps_found % 2 != 0)
-              {
-                curx += widget->allocation.height;
-              }
-              break;
-          }
-          if (curx < 0)
-          {
-            continue;
-          }
-
-          if (exps_found % 2 != 0)
-          {
-            _line_from_to (cr, &lx, &ly, curx - d, y2);
-            if (i->next != NULL)
-              _line_from_to (cr, &lx, &ly, curx, y);
-          }
-          else
-          {
-            _line_from_to (cr, &lx, &ly, curx, y);
-            _line_from_to (cr, &lx, &ly, curx + d, y2);
-          }
-          ++exps_found;
-        }
-        g_list_free (widgets);
-        
+      }
+      else
+      {
         _line_from_to (cr, &lx, &ly, w, ly);
         _line_from_to (cr, &lx, &ly, lx, y3);
-
-        cairo_close_path (cr);
       }
     }
     else
     {
       if (internal)
       {
-        /* Auto-Stripe & Not-Expanded & Internal */
-        /* no-path */
+        _line_from_to (cr, &lx, &ly, w - rdc, y2);
+        _line_from_to (cr, &lx, &ly, w, y3);
+        _line_from_to (cr, &lx, &ly, w - rdc, y);
       }
       else
       {
-        /* Auto-Stripe & Not-Expanded & External */
-        ly = y3;
-        cairo_move_to (cr, lx, ly);
-        
-        if (align == 0.)
-          _line_from_to (cr, &lx, &ly, lx , y);
-        else
-          _line_from_to (cr, &lx, &ly, lx + dc, y);
-        
-        if (align == 1.)
-          _line_from_to (cr, &lx, &ly, w, y);
-        else
-          _line_from_to (cr, &lx, &ly, w - dc, y);
-        
+        _line_from_to (cr, &lx, &ly, w - rdc, ly);
         _line_from_to (cr, &lx, &ly, w, y3);
-        cairo_close_path (cr);
       }
     }
   }
+  cairo_close_path (cr);
+  /****************************************************************************/
+  /********************     RESTART ANIMATION IF NEEDED  **********************/
+  /****************************************************************************/
+  if (update_positions)
+  {
+    if (needs_animation)
+    {
+      _restart_timeout (bg, priv);
+    }
+    else
+    {
+      priv->needs_animation = FALSE;
+    }
+  }
+  return y;
 }
 
 static void
 draw_top_bottom_background (AwnBackground*   bg,
                             GtkPositionType  position,
                             cairo_t*         cr,
-                            gint             width,
-                            gint             height)
+                            gfloat           width,
+                            gfloat           height)
 {
   cairo_pattern_t *pat = NULL;
-  cairo_pattern_t *pat_hi = NULL;
-  
+
   /* Basic set-up */
   cairo_set_line_width (cr, 1.0);
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
   gboolean expand = FALSE;
   g_object_get (bg->panel, "expand", &expand, NULL);
-  
+
   gfloat align = awn_background_get_panel_alignment (AWN_BACKGROUND (bg));
-  
+
   /* Make sure the bar gets drawn on the 0.5 pixels (for sharp edges) */
-  switch (position)
-  {
-    case GTK_POS_TOP:
-    case GTK_POS_BOTTOM:
-      cairo_translate (cr, 0., 0.5);
-      break;
-    default:
-      cairo_translate (cr, 0.5, 0.);
-      break;
-  }
-  
+  if (!expand)
+  {
+    cairo_translate (cr, 0.5, 0.5);
+    width -= 0.5;
+  }
+  else
+  {
+    cairo_translate (cr, -0.5, 0.5);
+    width += 1.;
+  }
+
   if (gtk_widget_is_composited (GTK_WIDGET (bg->panel)) == FALSE)
   {
     goto paint_lines;
   }
 
+  gfloat x = 0.,
+         y = 0.;
+  gfloat y_pat;
+
   /* create internal path */
-  _create_path_lucido (bg, position, cr, -1.0, 0., width, height,
-                       bg->stripe_width, TRANSFORM_RADIUS (bg->corner_radius),
-                       TRANSFORM_RADIUS (bg->corner_radius), bg->curves_symmetry,
-                       1, expand, align);
+  y_pat = _create_path_lucido (bg, position, cr, x, y, width, height,
+                               TRANSFORM_RADIUS (bg->corner_radius),
+                               TRANSFORM_RADIUS (bg->corner_radius),
+                               TRUE, expand, align, TRUE);
 
   /* Draw internal pattern if needed */
-  if ((expand || bg->stripe_width != 0.) && bg->enable_pattern && bg->pattern)
+  if (bg->enable_pattern && bg->pattern)
   {
     /* Prepare pattern */
-    pat_hi = cairo_pattern_create_for_surface (bg->pattern);
-    cairo_pattern_set_extend (pat_hi, CAIRO_EXTEND_REPEAT);
+    pat = cairo_pattern_create_for_surface (bg->pattern);
+    cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT);
     /* Draw */
     cairo_save (cr);
     cairo_clip_preserve (cr);
-    cairo_set_source (cr, pat_hi);
+    cairo_set_source (cr, pat);
     cairo_paint (cr);
     cairo_restore (cr);
-    cairo_pattern_destroy (pat_hi);
+    cairo_pattern_destroy (pat);
   }
 
   /* Prepare the internal background */
-  pat = cairo_pattern_create_linear (0, 0, 0, height);
-  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->border_color);
-  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->hilight_color);
+  pat = cairo_pattern_create_linear (x, y_pat, 0., height);
+  awn_cairo_pattern_add_color_stop_color (pat, 0., bg->g_histep_1);
+  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_histep_2);
 
   /* Draw the internal background gradient */
   cairo_save (cr);
@@ -613,37 +791,23 @@
   cairo_set_source (cr, pat);
   cairo_paint (cr);
   cairo_restore (cr);
+  awn_cairo_set_source_color (cr, bg->border_color);
+  cairo_stroke (cr);
+
+  /* create external path */
+  y_pat = _create_path_lucido (bg, position, cr, x, y, width, height,
+                               TRANSFORM_RADIUS (bg->corner_radius),
+                               TRANSFORM_RADIUS (bg->corner_radius),
+                               FALSE, expand, align, FALSE);
 
   /* Prepare external background gradient*/
-  if (expand || bg->stripe_width != 0.)
-  {
-    cairo_pattern_destroy (pat);
-    pat = cairo_pattern_create_linear (0, 0, 0, height);
-    awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
-    awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
-  }
-  
-  /* create external path */
-  _create_path_lucido (bg, position, cr, -1.0, 0., width, height,
-                       bg->stripe_width, TRANSFORM_RADIUS (bg->corner_radius),
-                       TRANSFORM_RADIUS (bg->corner_radius), bg->curves_symmetry,
-                       0, expand, align);
+  cairo_pattern_destroy (pat);
+  pat = cairo_pattern_create_linear (x, y_pat, 0., height);
+  awn_cairo_pattern_add_color_stop_color (pat, 0.0, bg->g_step_1);
+  awn_cairo_pattern_add_color_stop_color (pat, 1.0, bg->g_step_2);
 
-  /* Draw external pattern if needed */
-  if (!expand && bg->stripe_width == 0. && bg->enable_pattern && bg->pattern)
-  {
-    /* Prepare pattern */
-    pat_hi = cairo_pattern_create_for_surface (bg->pattern);
-    cairo_pattern_set_extend (pat_hi, CAIRO_EXTEND_REPEAT);
-    /* Draw */
-    cairo_save (cr);
-    cairo_clip_preserve (cr);
-    cairo_set_source (cr, pat_hi);
-    cairo_paint (cr);
-    cairo_restore (cr);
-    cairo_pattern_destroy (pat_hi);
-  }
-                       
+  /* Clean below external background */
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   /* Draw the external background  */
   cairo_save (cr);
   cairo_clip_preserve (cr);
@@ -651,21 +815,12 @@
   cairo_paint (cr);
   cairo_restore (cr);
   cairo_pattern_destroy (pat);
-  
-  /* Draw the hi-light */
-  pat_hi = cairo_pattern_create_linear (0, 0, 0, (height / 3.0));
-  awn_cairo_pattern_add_color_stop_color (pat_hi, 0.0, bg->g_histep_1);
-  awn_cairo_pattern_add_color_stop_color (pat_hi, 1.0, bg->g_histep_2);
-  
-  if (expand)
-  {
-    cairo_new_path (cr);
-    cairo_rectangle (cr, 0, 0, width, (height / 3.0));
-  }
-  
-  cairo_set_source (cr, pat_hi);
-  cairo_fill (cr);
-  cairo_pattern_destroy (pat_hi);
+  /* Restore operator */
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+  /* Draw border */
+  awn_cairo_set_source_color (cr, bg->hilight_color);
+  cairo_stroke (cr);
 
   return;
   /* if not composited */
@@ -675,26 +830,26 @@
   {
     /* Internal border */
     awn_cairo_set_source_color (cr, bg->hilight_color);
-    cairo_rectangle (cr, 1, 1, width - 3, height + 3);
+    cairo_rectangle (cr, 1., 1., width - 3., height + 3.);
     cairo_stroke (cr);
 
     /* External border */    
     awn_cairo_set_source_color (cr, bg->border_color);
-    cairo_rectangle (cr, 1, 1, width - 1, height + 3);
+    cairo_rectangle (cr, 1., 1., width - 1., height + 3.);
   }
   else
   {
     awn_cairo_set_source_color (cr, bg->border_color);
     _create_path_lucido (bg, position, cr, 0., 0., width, height,
-                         bg->stripe_width, TRANSFORM_RADIUS (bg->corner_radius),
-                         TRANSFORM_RADIUS (bg->corner_radius), bg->curves_symmetry,
-                         0, expand, align);
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         FALSE, expand, align, TRUE);
     cairo_stroke (cr);
     awn_cairo_set_source_color (cr, bg->hilight_color);
     _create_path_lucido (bg, position, cr, 1., 1., width-1., height-1.,
-                         bg->stripe_width, TRANSFORM_RADIUS (bg->corner_radius),
-                         TRANSFORM_RADIUS (bg->corner_radius), bg->curves_symmetry,
-                         0, expand, align);
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         FALSE, expand, align, FALSE);
   }
   cairo_stroke (cr);
 }
@@ -708,7 +863,6 @@
     guint *padding_left,
     guint *padding_right)
 {
-  #define TOP_PADDING 2
   gboolean expand = FALSE;
   g_object_get (bg->panel, "expand", &expand, NULL);
   gint side_padding = expand ? 0 : TRANSFORM_RADIUS (bg->corner_radius);
@@ -771,7 +925,8 @@
   switch (position)
   {
     case GTK_POS_RIGHT:
-      cairo_translate (cr, 0., y + height);
+      height += y;
+      cairo_translate (cr, 0., height);
       cairo_scale (cr, 1., -1.);
       cairo_translate (cr, x, height);
       cairo_rotate (cr, M_PI * 1.5);
@@ -780,26 +935,130 @@
       height = temp;
       break;
     case GTK_POS_LEFT:
-      cairo_translate (cr, x + width, y);
+      height += y;
+      cairo_translate (cr, x + width, 0.);
       cairo_rotate (cr, M_PI * 0.5);
       temp = width;
       width = height;
       height = temp;
       break;
     case GTK_POS_TOP:
-      cairo_translate (cr, x, y + height);
+      width += x;
+      cairo_translate (cr, 0., y + height);
       cairo_scale (cr, 1., -1.);
       break;
     default:
-      cairo_translate (cr, x, y);
+      width += x;
+      cairo_translate (cr, 0., y);
       break;
   }
-  
+
   draw_top_bottom_background (bg, position, cr, width, height);
-  
-  cairo_restore (cr);
-}
-
+
+  cairo_restore (cr);
+}
+
+static void 
+_set_special_widget_width_and_transparent (AwnBackground *bg,
+                                           gint          width,
+                                           gboolean      transp,
+                                           gboolean      dispose)
+{
+  GList *widgets = _get_applet_widgets (bg);
+  GList *i = widgets;
+  GtkWidget *widget = NULL;
+
+  if (i && IS_SPECIAL (i->data) && !dispose)
+  {
+    widget = GTK_WIDGET (i->data);
+    awn_separator_set_separator_size (AWN_SEPARATOR (widget), 1);
+    awn_separator_set_transparent (AWN_SEPARATOR (widget), transp);
+    i = i->next;
+  }
+
+  for (; i; i = i->next)
+  {
+    widget = GTK_WIDGET (i->data);
+    if (!IS_SPECIAL (widget)) 
+    {
+      /* if not special continue */
+      continue;
+    }
+    awn_separator_set_separator_size (AWN_SEPARATOR (widget), width);
+    awn_separator_set_transparent (AWN_SEPARATOR (widget), transp);
+  }
+
+  g_list_free (widgets);
+}
+
+static void
+awn_background_lucido_get_shape_mask (AwnBackground   *bg,
+                                      cairo_t         *cr,
+                                      GtkPositionType position,
+                                      GdkRectangle    *area)
+{
+  gint temp;
+  gint x = area->x, y = area->y;
+  gint width = area->width, height = area->height;
+  gfloat   align = 0.5;
+  gboolean expand = FALSE;
+
+  cairo_save (cr);
+
+  align = awn_background_get_panel_alignment (bg);
+  g_object_get (bg->panel, "expand", &expand, NULL);
+
+  switch (position)
+  {
+    case GTK_POS_RIGHT:
+      height += y;
+      cairo_translate (cr, 0., height);
+      cairo_scale (cr, 1., -1.);
+      cairo_translate (cr, x, height);
+      cairo_rotate (cr, M_PI * 1.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_LEFT:
+      height += y;
+      cairo_translate (cr, x + width, 0.);
+      cairo_rotate (cr, M_PI * 0.5);
+      temp = width;
+      width = height;
+      height = temp;
+      break;
+    case GTK_POS_TOP:
+      width += x;
+      cairo_translate (cr, 0., y + height);
+      cairo_scale (cr, 1., -1.);
+      break;
+    default:
+      width += x;
+      cairo_translate (cr, 0., y);
+      break;
+  }
+  if (expand)
+  {
+    cairo_rectangle (cr, 0., 0., width, height + 2.);
+  }
+  else
+  {
+    _create_path_lucido (bg, position, cr, 0., 0., width, height,
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         FALSE, expand, align, FALSE);
+    cairo_fill (cr);
+    _create_path_lucido (bg, position, cr, 0., 0., width, height,
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         TRANSFORM_RADIUS (bg->corner_radius),
+                         TRUE, expand, align, FALSE);
+
+  }
+  cairo_fill (cr);
+
+  cairo_restore (cr);
+}
 static gboolean
 awn_background_lucido_get_needs_redraw (AwnBackground *bg,
                                         GtkPositionType position,
@@ -812,47 +1071,43 @@
   {
     return TRUE;
   }
-  
-  /* Check expanders positions & sizes changed */
+  gboolean expand = FALSE;
+  g_object_get (bg->panel, "expand", &expand, NULL);
+  if (!expand)
+  {
+    return FALSE;
+  }
+  /* Check separators positions, 
+   * because bar's width doesn't change in expanded mode
+   */
   GList *widgets = _get_applet_widgets (bg);
   GList *i = widgets;
   GtkWidget *widget = NULL;
-  gint wcheck = 0;
-  gint ncheck = 0;
-  
+  gint  wcheck = 0, j = 0;
+
   for (; i; i = i->next)
   {
+    ++j;
     widget = GTK_WIDGET (i->data);
-
-    if (!GTK_IS_IMAGE (widget) || AWN_IS_SEPARATOR (widget)) 
+    if (!IS_SPECIAL (widget)) 
     {
-      /* if not expander continue */
+      /* if not special continue */
       continue;
     }
     switch (position)
     {
-      case GTK_POS_BOTTOM:
-      case GTK_POS_TOP:
-        wcheck += (widget->allocation.x * 3) / 2 + widget->allocation.width;
+      case GTK_POS_LEFT:
+      case GTK_POS_RIGHT:
+        wcheck += widget->allocation.y * j;
         break;
       default:
-        wcheck += (widget->allocation.y * 3 ) / 2 + widget->allocation.height;
+        wcheck += widget->allocation.x * j;
         break;
     }
-    ++ncheck;
   }
   g_list_free (widgets);
-  
-  AwnBackgroundLucido *lbg = NULL;
-  lbg = AWN_BACKGROUND_LUCIDO (bg);
-  AwnBackgroundLucidoPrivate *priv;
-  priv = AWN_BACKGROUND_LUCIDO_GET_PRIVATE (lbg);
-  if (priv->expn != ncheck)
-  {
-    priv->expn = ncheck;
-    /* used to refresh bar */
-    awn_background_emit_padding_changed (bg);
-  }
+  AwnBackgroundLucidoPrivate *priv = 
+                AWN_BACKGROUND_LUCIDO_GET_PRIVATE (AWN_BACKGROUND_LUCIDO (bg));
   if (priv->expw != wcheck)
   {
     priv->expw = wcheck;
@@ -860,63 +1115,4 @@
   }
   return FALSE;
 }
-
-static void
-awn_background_lucido_get_shape_mask (AwnBackground   *bg,
-                                      cairo_t         *cr,
-                                      GtkPositionType position,
-                                      GdkRectangle    *area)
-{
-  gint temp;
-  gint x = area->x, y = area->y;
-  gint width = area->width, height = area->height;
-  gfloat   align = 0.5;
-  gboolean expand = FALSE;
-
-  cairo_save (cr);
-
-  align = awn_background_get_panel_alignment (bg);
-  g_object_get (bg->panel, "expand", &expand, NULL);
-
-  switch (position)
-  {
-    case GTK_POS_RIGHT:
-      cairo_translate (cr, 0., y + height);
-      cairo_scale (cr, 1., -1.);
-      cairo_translate (cr, x, height);
-      cairo_rotate (cr, M_PI * 1.5);
-      temp = width;
-      width = height;
-      height = temp;
-      break;
-    case GTK_POS_LEFT:
-      cairo_translate (cr, x + width, y);
-      cairo_rotate (cr, M_PI * 0.5);
-      temp = width;
-      width = height;
-      height = temp;
-      break;
-    case GTK_POS_TOP:
-      cairo_translate (cr, x, y + height);
-      cairo_scale (cr, 1., -1.);
-      break;
-    default:
-      cairo_translate (cr, x, y);
-      break;
-  }
-  if (expand)
-  {
-    cairo_rectangle (cr, 0, 0, width, height + 2);
-  }
-  else
-  {
-    _create_path_lucido (bg, position, cr, 0, 0., width, height,
-                         bg->stripe_width, TRANSFORM_RADIUS (bg->corner_radius),
-                         TRANSFORM_RADIUS (bg->corner_radius), bg->curves_symmetry,
-                         0, expand, align);
-  }
-  cairo_fill (cr);
-
-  cairo_restore (cr);
-}
 /* vim: set et ts=2 sts=2 sw=2 : */

=== modified file 'src/awn-background.c'
--- src/awn-background.c	2010-06-02 09:54:30 +0000
+++ src/awn-background.c	2010-07-16 11:56:43 +0000
@@ -60,7 +60,7 @@
   PROP_CURVINESS,
   PROP_CURVES_SYMEMETRY,
   PROP_FLOATY_OFFSET,
-  PROP_STRIPE_WIDTH
+  PROP_THICKNESS
 };
 
 enum 
@@ -198,8 +198,8 @@
                                        DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
                                        NULL);
   desktop_agnostic_config_client_bind (bg->client,
-                                       AWN_GROUP_THEME, AWN_THEME_STRIPE_WIDTH,
-                                       object, "stripe-width", TRUE,
+                                       AWN_GROUP_THEME, AWN_THEME_THICKNESS,
+                                       object, "thickness", TRUE,
                                        DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
                                        NULL);
 }
@@ -236,6 +236,9 @@
     case PROP_FLOATY_OFFSET:
       g_value_set_int (value, bg->floaty_offset);
       break;
+    case PROP_THICKNESS:
+      g_value_set_float (value, bg->thickness);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -364,12 +367,12 @@
     case PROP_CURVES_SYMEMETRY:
       bg->curves_symmetry = g_value_get_float (value);
       break;
+    case PROP_THICKNESS:
+      bg->thickness = g_value_get_float (value);
+      break;
     case PROP_FLOATY_OFFSET:
       bg->floaty_offset = g_value_get_int (value);
       break;
-    case PROP_STRIPE_WIDTH:
-      bg->stripe_width = g_value_get_float (value);
-      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -619,16 +622,15 @@
                         0.0, 1.0, 0.5,
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
                         G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (obj_class,
+    PROP_THICKNESS,
+    g_param_spec_float ("thickness",
+                        "Thickness",
+                        "The thickness in 3D mode",
+                        0.0, 1.0, 0.6,
+                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+                        G_PARAM_STATIC_STRINGS));
                         
-  g_object_class_install_property (obj_class,
-    PROP_STRIPE_WIDTH,
-    g_param_spec_float ("stripe-width",
-                        "Stripe Width",
-                        "The width of the stripe",
-                        0.0, 1.0, 0.0,
-                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
-                        G_PARAM_STATIC_STRINGS));
-
   /* Add signals to the class */
   _bg_signals[CHANGED] = 
     g_signal_new ("changed",
@@ -870,7 +872,7 @@
 awn_background_emit_padding_changed (AwnBackground *bg)
 {
   g_return_if_fail (AWN_IS_BACKGROUND (bg));
-
+  awn_background_invalidate (bg);
   g_signal_emit (bg, _bg_signals[PADDING_CHANGED], 0);
 }
 
@@ -878,7 +880,7 @@
 awn_background_emit_changed (AwnBackground *bg)
 {
   g_return_if_fail (AWN_IS_BACKGROUND (bg));
-
+  awn_background_invalidate (bg);
   g_signal_emit (bg, _bg_signals[CHANGED], 0);
 }
 

=== modified file 'src/awn-background.h'
--- src/awn-background.h	2010-05-31 17:41:58 +0000
+++ src/awn-background.h	2010-07-16 11:56:43 +0000
@@ -76,7 +76,7 @@
   gfloat     pattern_alpha;
   GdkPixbuf *pattern_original;
   cairo_surface_t *pattern;
-  
+
   /*  Speedup code.
    *  We can save the bg and redraw only when properties changes
    */
@@ -91,7 +91,7 @@
    */
   gboolean dialog_gtk_mode;
   gboolean gtk_theme_mode;
-  
+
   /* Appearance options -- (some are backend specific) */
   gboolean rounded_corners;
   gfloat   corner_radius;
@@ -99,7 +99,7 @@
   gint     floaty_offset;
   gfloat   curviness;
   gfloat   curves_symmetry;
-  gfloat   stripe_width;
+  gfloat   thickness;
 
   /* private */
   guint    changed;

=== modified file 'src/awn-defines.h'
--- src/awn-defines.h	2010-05-31 17:41:58 +0000
+++ src/awn-defines.h	2010-07-16 11:56:43 +0000
@@ -88,7 +88,7 @@
 #define AWN_THEME_CURVINESS        "curviness"
 #define AWN_THEME_CURVES_SYMMETRY  "curves_symmetry"
 #define AWN_THEME_FLOATY_OFFSET    "floaty_offset"
-#define AWN_THEME_STRIPE_WIDTH     "stripe_width"
+#define AWN_THEME_THICKNESS        "thickness"
 
 #endif /*_HAVE_AWN_DEFINES_H */
 

=== modified file 'src/awn-panel.c'
--- src/awn-panel.c	2010-05-31 16:49:07 +0000
+++ src/awn-panel.c	2010-07-16 11:56:43 +0000
@@ -3920,6 +3920,12 @@
   return FALSE;
 }
 
+gboolean
+awn_panel_get_docklet_mode (AwnPanel *panel)
+{
+  return panel->priv->docklet != NULL;
+}
+
 static void
 awn_panel_docklet_destroy (AwnPanel *panel)
 {

=== modified file 'src/awn-panel.h'
--- src/awn-panel.h	2010-05-30 22:48:59 +0000
+++ src/awn-panel.h	2010-07-16 11:56:43 +0000
@@ -111,6 +111,8 @@
                                            gboolean          expand,
                                            DBusGMethodInvocation *context);
 
+gboolean    awn_panel_get_docklet_mode    (AwnPanel         *panel);
+
 gboolean    awn_panel_get_snapshot        (AwnPanel *panel,
                                            GValue *value,
                                            GError **error);

=== modified file 'src/awn-separator.c'
--- src/awn-separator.c	2010-01-01 21:35:47 +0000
+++ src/awn-separator.c	2010-07-16 11:56:43 +0000
@@ -34,7 +34,9 @@
   GtkPositionType  position;
   gint             offset;
   gint             size;
+  gint             separator_size;
 
+  gboolean         transparent;
   DesktopAgnosticColor *sep_color;
 };
 
@@ -47,7 +49,10 @@
   PROP_OFFSET,
   PROP_SIZE,
 
-  PROP_SEP_COLOR
+  PROP_SEP_COLOR,
+  PROP_SEP_TRANSPARENT,
+  
+  PROP_SEP_SIZE
 };
 
 static void
@@ -78,6 +83,12 @@
     case PROP_SEP_COLOR:
       g_value_set_object (value, priv->sep_color);
       break;
+    case PROP_SEP_SIZE:
+      g_value_set_int (value, priv->separator_size);
+      break;
+    case PROP_SEP_TRANSPARENT:
+      g_value_set_boolean (value, priv->transparent);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -126,6 +137,14 @@
       priv->sep_color = g_value_dup_object (value);
       gtk_widget_queue_draw (GTK_WIDGET (object));
       break;
+    case PROP_SEP_SIZE:
+      awn_separator_set_separator_size (AWN_SEPARATOR (object),
+                                        g_value_get_int (value));
+      break;
+    case PROP_SEP_TRANSPARENT:
+      awn_separator_set_transparent (AWN_SEPARATOR (object),
+                                     g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   }
@@ -181,13 +200,13 @@
   {
     case GTK_POS_TOP:
     case GTK_POS_BOTTOM:
-      req->width = 10;
+      req->width = priv->separator_size;
       req->height = priv->size + priv->offset;
       break;
     case GTK_POS_LEFT:
     case GTK_POS_RIGHT:
       req->width = priv->size + priv->offset;
-      req->height = 10;
+      req->height = priv->separator_size;
       break;
     default:
       break;
@@ -198,6 +217,12 @@
 awn_separator_expose (GtkWidget *widget, GdkEventExpose *event)
 {
   AwnSeparatorPrivate *priv = AWN_SEPARATOR (widget)->priv;
+
+  if (priv->transparent)
+  {
+    return TRUE;
+  }
+
   cairo_t *cr;
   cairo_path_t *path;
   GtkOrientation orient;
@@ -366,6 +391,24 @@
                          DESKTOP_AGNOSTIC_TYPE_COLOR,
                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  g_object_class_install_property (object_class,
+    PROP_SEP_SIZE,
+    g_param_spec_int ("separator-size",
+                      "Separator Size",
+                      "The size of the separator",
+                      0, G_MAXINT, 10,
+                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+                      G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class,
+    PROP_SEP_TRANSPARENT,
+    g_param_spec_boolean ("transparent",
+                          "Transparent",
+                          "Is separator transparent?",
+                          FALSE,
+                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+                          G_PARAM_STATIC_STRINGS));
+
   g_type_class_add_private (klass, sizeof (AwnSeparatorPrivate));
 }
 
@@ -405,3 +448,35 @@
                        NULL);
 }
 
+void 
+awn_separator_set_transparent (AwnSeparator *sep, gboolean transp)
+{
+  if (sep->priv->transparent != transp)
+  {
+    sep->priv->transparent = transp;
+    gtk_widget_queue_draw (GTK_WIDGET (sep));
+  }
+}
+
+gboolean 
+awn_separator_get_transparent (AwnSeparator *sep, gboolean transp)
+{
+  return sep->priv->transparent;
+}
+
+void 
+awn_separator_set_separator_size (AwnSeparator *sep, gint size)
+{
+  if (sep->priv->separator_size != size)
+  {
+    sep->priv->separator_size = size;
+    gtk_widget_queue_resize (GTK_WIDGET (sep));
+  }
+}
+
+gint 
+awn_separator_get_separator_size (AwnSeparator *sep, gint size)
+{
+  return sep->priv->separator_size;
+}
+

=== modified file 'src/awn-separator.h'
--- src/awn-separator.h	2009-10-31 12:14:11 +0000
+++ src/awn-separator.h	2010-07-16 11:56:43 +0000
@@ -65,6 +65,18 @@
                                            GtkPositionType pos,
                                            gint size, gint offset);
 
+void 
+awn_separator_set_transparent (AwnSeparator *sep, gboolean transp);
+
+gboolean 
+awn_separator_get_transparent (AwnSeparator *sep, gboolean transp);
+
+void 
+awn_separator_set_separator_size (AwnSeparator *sep, gint size);
+
+gint 
+awn_separator_get_separator_size (AwnSeparator *sep, gint size);
+
 G_END_DECLS
 
 #endif /* _AWN_SEPARATOR_H_ */