sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reposition palette on secondary state.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-07-24 16:21:21 +02:00
parent 445b1dd413
commit f23d9e8f0d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sugar/graphics/palette.py
View File

@ -250,12 +250,7 @@ class Palette(gobject.GObject):
self._set_state(state) self._set_state(state)
def _show(self): def _update_position(self):
if self._up:
return
self._update_full_request()
x = y = 0 x = y = 0
if self._position == self.DEFAULT: if self._position == self.DEFAULT:
@ -281,11 +276,19 @@ class Palette(gobject.GObject):
elif position == self.TOP: elif position == self.TOP:
x, y = self._get_top_position() x, y = self._get_top_position()
self._invoker.connect_to_parent() self._menu.popup(x, y)
def _show(self):
if self._up:
return
self._update_full_request()
self._invoker.connect_to_parent()
self._palette_popup_sid = _palette_observer.connect('popup', self._palette_popup_sid = _palette_observer.connect('popup',
self._palette_observer_popup_cb) self._palette_observer_popup_cb)
self._menu.popup(x, y)
self._update_position()
self._up = True self._up = True
_palette_observer.emit('popup', self) _palette_observer.emit('popup', self)
@ -428,7 +431,7 @@ class _SecondaryAnimation(animator.Animation):
def next_frame(self, current): def next_frame(self, current):
if current == 1.0: if current == 1.0:
self._palette._set_state(Palette._SECONDARY) self._palette._set_state(Palette._SECONDARY)
self._palette._show() self._palette._update_position()
class _PopdownAnimation(animator.Animation): class _PopdownAnimation(animator.Animation):
def __init__(self, palette): def __init__(self, palette):