sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show proper state indication for CanvasIcons

Browse Source 
Commit a19cf9e changed the logic for handling CanvasIcon clicks.  Therefore,
the visual state indicators must be updated to fit the new logic.

Test Case:  Hold the mouse down on a home view icon.  Move the mouse
in and out of the icon.  See that the states correspond with what
happens if you release the mouse.
This commit is contained in:
Sam Parkinson 2015-07-26 09:22:16 +10:00 committed by Gonzalo Odiard
parent ecc2f491b6
commit 16107a3985
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sugar3/graphics/icon.py
View File

@ -781,6 +781,7 @@ class CanvasIcon(EventIcon):
def __init__(self, **kwargs): def __init__(self, **kwargs):
EventIcon.__init__(self, **kwargs) EventIcon.__init__(self, **kwargs)
self._button_down = False
self.connect('enter-notify-event', self.__enter_notify_event_cb) self.connect('enter-notify-event', self.__enter_notify_event_cb)
self.connect('leave-notify-event', self.__leave_notify_event_cb) self.connect('leave-notify-event', self.__leave_notify_event_cb)
@ -804,21 +805,25 @@ class CanvasIcon(EventIcon):
def __enter_notify_event_cb(self, icon, event): def __enter_notify_event_cb(self, icon, event):
self.set_state_flags(self.get_state_flags() | Gtk.StateFlags.PRELIGHT, self.set_state_flags(self.get_state_flags() | Gtk.StateFlags.PRELIGHT,
clear=True) clear=True)
if self._button_down:
self.set_state_flags(Gtk.StateFlags.ACTIVE, clear=False)
def __leave_notify_event_cb(self, icon, event): def __leave_notify_event_cb(self, icon, event):
if self.palette and self.palette.is_up(): if self.palette and self.palette.is_up():
return return
self.unset_state_flags(Gtk.StateFlags.PRELIGHT) self.unset_state_flags(Gtk.StateFlags.PRELIGHT | Gtk.StateFlags.ACTIVE)
def __button_press_event_cb(self, icon, event): def __button_press_event_cb(self, icon, event):
if self.palette and not self.palette.is_up(): if self.palette and not self.palette.is_up():
self._button_down = True
self.set_state_flags( self.set_state_flags(
self.get_state_flags() | Gtk.StateFlags.ACTIVE, self.get_state_flags() | Gtk.StateFlags.ACTIVE,
clear=True) clear=True)
def __button_release_event_cb(self, icon, event): def __button_release_event_cb(self, icon, event):
self.unset_state_flags(Gtk.StateFlags.ACTIVE) self.unset_state_flags(Gtk.StateFlags.ACTIVE)
self._button_down = False
def __palette_popup_cb(self, palette): def __palette_popup_cb(self, palette):
self.set_state_flags(Gtk.StateFlags.PRELIGHT, clear=True) self.set_state_flags(Gtk.StateFlags.PRELIGHT, clear=True)