Hide active palette if zoom level changes.

1 files changed, 15 insertions, 0 deletions

diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index ef1a61c..9c23c2f 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -21,6 +21,7 @@ import gtk
 import gobject
 import time
 import hippo
+import dbus
 
 from sugar.graphics import animator
 from sugar.graphics import units
@@ -87,6 +88,15 @@ class Palette(gobject.GObject):
         self._menu.connect('button-press-event',
                            self._button_press_event_cb)
 
+        gobject.idle_add(self._listen_for_zoom_level_change)
+
+    def _listen_for_zoom_level_change(self):
+        bus = dbus.Bus()
+        proxy = bus.get_object('org.laptop.Shell', '/org/laptop/Shell')
+        shell_service = dbus.Interface(proxy, 'org.laptop.Shell')
+        shell_service.connect_to_signal('ZoomLevelChanged',
+                                        self._zoom_level_changed_cb)
+
     def set_primary_text(self, label, accel_path=None):
         self._primary.set_label(label, accel_path)
 
@@ -234,6 +244,9 @@ class Palette(gobject.GObject):
     def _button_press_event_cb(self, widget, event):
         pass
 
+    def _zoom_level_changed_cb(self, zoom_level):
+        self._hide()
+
 class _PrimaryMenuItem(gtk.MenuItem):
     def __init__(self, label, accel_path):
         gtk.MenuItem.__init__(self)
@@ -378,6 +391,8 @@ class CanvasInvoker(Invoker):
         context = self._item.get_context()
         if context:
             x, y = context.translate_to_screen(self._item)
+        else:
+            x, y = 0, 0
 
         width, height = self._item.get_allocation()