[monet/monet-xml: 4/10] mn-style: fix various drawing issues

[Thomas Wood <thos src gnome org>]

commit 08ba7debd804a6ced520a446e08a394b1eac4462
Author: Thomas Wood <thos gnome org>
Date:   Mon Apr 5 15:42:50 2010 +0100

    mn-style: fix various drawing issues

 monet/mn-style.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/monet/mn-style.c b/monet/mn-style.c
index 01b9d3b..d6c6f57 100644
--- a/monet/mn-style.c
+++ b/monet/mn-style.c
@@ -340,7 +340,7 @@ mn_style_paint_entry (MnStyle   *style,
 
   cairo_rectangle (cr, x, y, width, height);
 
-  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_FG, state);
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
 
   cairo_stroke (cr);
 
@@ -401,12 +401,13 @@ mn_style_paint_check_box (MnStyle   *style,
 
   cairo_rectangle (cr, x, y, width, height);
 
-  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
-  cairo_stroke_preserve (cr);
-
   mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BG, state);
+  cairo_fill_preserve (cr);
+
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
   cairo_stroke (cr);
 
+
   if (flags & MN_FLAGS_CHECKED)
     {
       cairo_rectangle (cr, x + 2.5, y + 2.5, width - 5, height - 5);
@@ -500,7 +501,6 @@ mn_style_paint_menu (MnStyle   *style,
   cairo_rectangle (cr, x, y, width, height);
 
   mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
-
   cairo_stroke (cr);
 
   cairo_restore (cr);
@@ -527,8 +527,10 @@ mn_style_paint_menu_item (MnStyle   *style,
 
   cairo_rectangle (cr, x, y, width, height);
 
-  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BG, state);
+  cairo_fill_preserve (cr);
 
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
   cairo_stroke (cr);
 
   cairo_restore (cr);
@@ -555,8 +557,10 @@ mn_style_paint_menu_bar (MnStyle   *style,
 
   cairo_rectangle (cr, x, y, width, height);
 
-  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BG, state);
+  cairo_fill_preserve (cr);
 
+  mn_cairo_set_source_from_palette (cr, colors, MN_COLOR_BORDER, state);
   cairo_stroke (cr);
 
   cairo_restore (cr);