diff options
| -rw-r--r-- | sugar/graphics/palette.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py index 85e60ac..e84cc51 100644 --- a/sugar/graphics/palette.py +++ b/sugar/graphics/palette.py @@ -151,6 +151,7 @@ class Palette(gtk.Window): self.set_border_width(self.style.xthickness) self.connect('realize', self._realize_cb) self.connect('destroy', self.__destroy_cb) + self.connect('map-event', self.__map_event_cb) self.palette_state = self.PRIMARY @@ -414,16 +415,11 @@ class Palette(gtk.Window): self._update_full_request() self._alignment = self._invoker.get_alignment(self._full_request) self._update_position() + self.set_transient_for(self._invoker.get_toplevel()) self.menu.set_active(True) self.show() - self._invoker.notify_popup() - - self._up = True - _palette_observer.emit('popup', self) - self.emit('popup') - def _hide(self): self._secondary_anim.stop() @@ -514,6 +510,13 @@ class Palette(gtk.Window): if self != palette: self._hide() + def __map_event_cb(self, widget, event): + self._invoker.notify_popup() + + self._up = True + _palette_observer.emit('popup', self) + self.emit('popup') + class PaletteActionBar(gtk.HButtonBox): def add_action(label, icon_name=None): button = Button(label) |