From 2b2f9aa27828f44ebdce0af32566f74b0762178c Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Tue, 11 Dec 2012 13:44:49 +0000
Subject: Draw the fillcolor button in the correct order - SL #4303

Similar to the change in the last patch

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/toolbox.py b/toolbox.py
index 15d638c..188ea30 100644
--- a/toolbox.py
+++ b/toolbox.py
@@ -433,6 +433,23 @@ class ButtonFillColor(ColorToolButton):
     def _on_keep_aspect_checkbutton_toggled(self, checkbutton):
         self._activity.area.keep_shape_ratio = checkbutton.get_active()
 
+    def do_draw(self, cr):
+        child = self.get_child()
+        if self._palette and self._palette.is_up():
+            allocation = self.get_allocation()
+            # draw a black background, has been done by the engine before
+            cr.set_source_rgb(0, 0, 0)
+            cr.rectangle(0, 0, allocation.width, allocation.height)
+            cr.paint()
+
+        Gtk.ToolItem.do_draw(self, cr)
+
+        if self._palette and self._palette.is_up():
+            invoker = self._palette.props.invoker
+            invoker.draw_rectangle(cr, self._palette)
+
+        return False
+
 
 ##Make the Shapes Toolbar
 class ShapesToolbar(Gtk.Toolbar):
--
cgit v0.9.1