From 1497ebc0063e7e4c5b4169c6746fd84b25573caa Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 29 Nov 2012 12:32:04 -0300 Subject: [PATCH] CanvasIcon: do not keep it ACTIVE when right-click twice SL #4224 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a CanvasIcon is right-clicked __button_press_event_cb and __palette_popup_cb are called but not __button_release_event_cb. So, ACTIVE flag is set but immediately removed by __palette_popup_cb and PRELIGHT is set. Now, if the user right-click it again while the palette is popped up, __button_press_event_cb is called and it sets ACTIVE flag but __palette_popup_cb is not called again because the palette is already shown and that makes the icon to keep in ACTIVE state. This patch checks if the palette is popped up when __button_press_event_cb is called and if the palette is not popped up the ACTIVE flag is set. Signed-off-by: Manuel Kaufmann Acked-by: Manuel Quiñones --- src/sugar3/graphics/icon.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sugar3/graphics/icon.py b/src/sugar3/graphics/icon.py index 507db413..5bdb3b8b 100644 --- a/src/sugar3/graphics/icon.py +++ b/src/sugar3/graphics/icon.py @@ -727,8 +727,9 @@ class CanvasIcon(EventIcon): self.unset_state_flags(Gtk.StateFlags.PRELIGHT) def __button_press_event_cb(self, icon, event): - self.set_state_flags(self.get_state_flags() | Gtk.StateFlags.ACTIVE, - clear=True) + if not self.palette.is_up(): + self.set_state_flags(self.get_state_flags() | Gtk.StateFlags.ACTIVE, + clear=True) def __button_release_event_cb(self, icon, event): self.unset_state_flags(Gtk.StateFlags.ACTIVE)