diff options
Diffstat (limited to 'sugar/graphics')
-rw-r--r-- | sugar/graphics/palette.py | 5 | ||||
-rw-r--r-- | sugar/graphics/toolbox.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py index e2dfd21..19a7249 100644 --- a/sugar/graphics/palette.py +++ b/sugar/graphics/palette.py @@ -98,7 +98,8 @@ class MouseSpeedDetector(gobject.GObject): def _get_mouse_position(self): display = gtk.gdk.display_get_default() - return display.get_pointer()[1:3] + screen_, x, y, mask_ = display.get_pointer() + return (x, y) def _detect_motion(self): oldx, oldy = self._mouse_pos @@ -737,7 +738,7 @@ class Invoker(gobject.GObject): if self._cursor_x == -1 or self._cursor_y == -1: display = gtk.gdk.display_get_default() - x, y = display.get_pointer()[1:3] + screen_, x, y, mask_ = display.get_pointer() self._cursor_x = x self._cursor_y = y diff --git a/sugar/graphics/toolbox.py b/sugar/graphics/toolbox.py index 4897add..f0889be 100644 --- a/sugar/graphics/toolbox.py +++ b/sugar/graphics/toolbox.py @@ -59,7 +59,7 @@ class Toolbox(gtk.VBox): def add_toolbar(self, name, toolbar): label = gtk.Label(name) - width = label.size_request()[0] + width, height_ = label.size_request() label.set_size_request(max(width, style.TOOLBOX_TAB_LABEL_WIDTH), -1) label.set_alignment(0.0, 0.5) |