diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-11 10:16:49 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-11 10:16:49 (GMT) |
| commit | dcef110223e312d44955ca4aa1e2f306b9cb9e12 (patch) | |
| tree | 2ffd499e26b4ab850f342f036b503e24d83d538d /sugar | |
| parent | a85bc85a824c51e5e81860203cd8d2bee834e02f (diff) | |
Embed/unembed the menu on state changes, keeping it around
cause some weird drawing issues.
Redraw on palette size changes (patch by Benzea).
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/_sugaruiext.defs | 6 | ||||
| -rw-r--r-- | sugar/graphics/palette.py | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/sugar/_sugaruiext.defs b/sugar/_sugaruiext.defs index 456344a..3c011e1 100644 --- a/sugar/_sugaruiext.defs +++ b/sugar/_sugaruiext.defs @@ -44,6 +44,12 @@ ) ) +(define-method unembed + (of-object "SugarMenu") + (c-name "sugar_menu_unembed") + (return-type "none") +) + ;; From sugar-key-grabber.h (define-function sugar_key_grabber_get_type diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py index c8d0d98..368a0f6 100644 --- a/sugar/graphics/palette.py +++ b/sugar/graphics/palette.py @@ -138,9 +138,9 @@ class Palette(gtk.Window): self._separator = gtk.HSeparator() self._secondary_box.pack_start(self._separator) - menu_box = gtk.VBox() - self._secondary_box.pack_start(menu_box) - menu_box.show() + self._menu_box = gtk.VBox() + self._secondary_box.pack_start(self._menu_box) + self._menu_box.show() self._content = gtk.VBox() self._secondary_box.pack_start(self._content) @@ -154,7 +154,6 @@ class Palette(gtk.Window): vbox.show() self.menu = _Menu(self) - self.menu.embed(menu_box) self.menu.show() self.connect('enter-notify-event', @@ -223,6 +222,10 @@ class Palette(gtk.Window): else: raise AssertionError + def do_size_allocate(self, allocation): + gtk.Window.do_size_allocate(self, allocation) + self.queue_draw() + def do_expose_event(self, event): # We want to draw a border with a beautiful gap if self._draw_gap: @@ -428,8 +431,10 @@ class Palette(gtk.Window): return if state == self._PRIMARY: + self.menu.unembed() self._secondary_box.hide() elif state == self._SECONDARY: + self.menu.embed(self._menu_box) self._secondary_box.show() self._state = state |