diff options
author | Benjamin Berg <benjamin@sipsolutions.net> | 2008-02-25 16:12:08 (GMT) |
---|---|---|
committer | Benjamin Berg <benjamin@sipsolutions.net> | 2008-02-25 16:12:08 (GMT) |
commit | 826bf9dd4caa07903346a756f34779da3c6c47b1 (patch) | |
tree | c41444bd869c5eed879d48dba51187cd4ad4def0 | |
parent | c9871633e3f3b38bcb8ae388ebeaaa81ad4123c9 (diff) |
Emit palette popup only after the window is mapped. This fixes ticket #3486.
-rw-r--r-- | sugar/graphics/palette.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py index 7ab35b6..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 @@ -419,12 +420,6 @@ class Palette(gtk.Window): 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() @@ -515,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) |