Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@member.fsf.org>2009-09-10 07:48:20 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2009-09-10 07:48:20 (GMT)
commit868c9293ac451db0e72c227d58534b60eb01938a (patch)
treec9c12f1cb86e722a9bcba8ff35a9d16ffd21efa5
parentc69bbe3341ae7383d3684964b4884be748939c53 (diff)
Hide palette group before immediate popup #1291
-rw-r--r--src/sugar/graphics/palettegroup.py3
-rw-r--r--src/sugar/graphics/palettewindow.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/sugar/graphics/palettegroup.py b/src/sugar/graphics/palettegroup.py
index 5f15bde..7e6ce46 100644
--- a/src/sugar/graphics/palettegroup.py
+++ b/src/sugar/graphics/palettegroup.py
@@ -83,6 +83,9 @@ class Group(gobject.GObject):
palette.popdown(immediate=True)
def _palette_popup_cb(self, palette):
+ for i in self._palettes:
+ if i != palette:
+ i.popdown(immediate=True)
if not self._up:
self.emit('popup')
self._up = True
diff --git a/src/sugar/graphics/palettewindow.py b/src/sugar/graphics/palettewindow.py
index d08052f..6b3ce42 100644
--- a/src/sugar/graphics/palettewindow.py
+++ b/src/sugar/graphics/palettewindow.py
@@ -371,7 +371,8 @@ class PaletteWindow(gtk.Window):
self.on_leave(event)
def __show_cb(self, widget):
- self._invoker.notify_popup()
+ if self._invoker is not None:
+ self._invoker.notify_popup()
self._up = True
self.emit('popup')