From bbede53e28653119a8269c6d1e61cf1cf66f4a9e Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Fri, 23 Nov 2012 12:35:03 +0000
Subject: Revert "Use the new lockable Palette"

This reverts commit 63d4ce3311cff113f6c46ab4b656a9a101fc0aac.
The patch pushed was not the right version

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/widgets.py b/widgets.py
index 70cc6a3..b98a21e 100644
--- a/widgets.py
+++ b/widgets.py
@@ -47,6 +47,7 @@ class BrushButton(_ColorButton):
         GObject.GObject.__init__(self, **kwargs)
         self._preview.set_events(Gdk.EventMask.BUTTON_PRESS_MASK)
 
+        self._preview.connect('button_press_event', self.__mouse_down_cb)
         self._preview.connect("draw", self.draw)
         self.set_image(self._preview)
 
@@ -166,6 +167,15 @@ class BrushButton(_ColorButton):
     def get_icon_size(self):
         pass
 
+    def __mouse_down_cb(self, event):
+        if self._palette:
+            if not self._palette.is_up():
+                self._palette.popup(immediate=True,
+                                    state=self._palette.SECONDARY)
+            else:
+                self._palette.popdown(immediate=True)
+            return True
+
 
 class ButtonStrokeColor(Gtk.ToolItem):
     """Class to manage the Stroke Color of a Button"""
@@ -196,8 +206,6 @@ class ButtonStrokeColor(Gtk.ToolItem):
         self.color_button.set_relief(Gtk.ReliefStyle.NONE)
 
         self._palette_invoker.attach_tool(self)
-        self._palette_invoker.props.toggle_palette = True
-        self._palette_invoker.props.lock_palette = True
 
         # This widget just proxies the following properties to the colorbutton
         self.color_button.connect('notify::color', self.__notify_change)
--
cgit v0.9.1