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

Merge branch 'long-press-eventicons' of https://github.com/samdroid-apps/sugar-toolkit-gtk3

Browse Source
This commit is contained in:
Sam Parkinson 2016-07-08 22:22:40 +10:00
commit 4009e2a476
No known key found for this signature in database
GPG Key ID: 34E268B2FA2F8B13
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -797,7 +797,10 @@ class EventIcon(Gtk.EventBox):
self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK | self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK |
Gdk.EventMask.TOUCH_MASK | Gdk.EventMask.TOUCH_MASK |
Gdk.EventMask.BUTTON_RELEASE_MASK) Gdk.EventMask.BUTTON_RELEASE_MASK)
self.connect('button-release-event', self.__button_release_event_cb) # Connect after the default so that the palette can silence events
# for example, after a touch palette invocation
self.connect_after('button-release-event',
self.__button_release_event_cb)
for key, value in kwargs.iteritems(): for key, value in kwargs.iteritems():
self.set_property(key, value) self.set_property(key, value)

1
src/sugar3/graphics/palettewindow.py
View File

@ -1381,6 +1381,7 @@ class CursorInvoker(Invoker):
def __long_pressed_event_cb(self, controller, x, y, widget): def __long_pressed_event_cb(self, controller, x, y, widget):
self._long_pressed_recognized = True self._long_pressed_recognized = True
x, y = widget.get_window().get_root_coords(x, y)
self.notify_right_click(x, y) self.notify_right_click(x, y)
def get_toplevel(self): def get_toplevel(self):