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

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Simon Schampijer 2007-09-01 18:12:55 +02:00
commit d79db5d172
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -1,3 +1,8 @@
* #2971: Fix palette flash when the mouse pointer leave the palete and go
over the Invoker (marco)
Snapshot feb462d08d
* Don't allow removing system-installed activities. (tomeu) * Don't allow removing system-installed activities. (tomeu)
* #3063: Make the 'Keep' button in the activity toolbar create a copy of the * #3063: Make the 'Keep' button in the activity toolbar create a copy of the
activity in the journal. Add a copy() method for activities to use. (tomeu) activity in the journal. Add a copy() method for activities to use. (tomeu)
@ -14,6 +19,7 @@ Snapshot e65fef5c79
Snapshot 23ad88db0c Snapshot 23ad88db0c
* #1986: Add Reboo option in Home View (edsiper)
* Re-share an activity when it gets launched from the journal if it was * Re-share an activity when it gets launched from the journal if it was
shared before (dcbw) shared before (dcbw)
* Update to new tubes API (cassidy) * Update to new tubes API (cassidy)

6
sugar/graphics/palette.py
View File

@ -327,7 +327,6 @@ class Palette(gtk.Window):
self._secondary_anim.start() self._secondary_anim.start()
def popdown(self, immediate=False): def popdown(self, immediate=False):
self._secondary_anim.stop()
self._popup_anim.stop() self._popup_anim.stop()
if not immediate: if not immediate:
@ -350,6 +349,11 @@ class Palette(gtk.Window):
def _invoker_mouse_enter_cb(self, invoker): def _invoker_mouse_enter_cb(self, invoker):
immediate = False immediate = False
if self.is_up():
self._popdown_anim.stop()
return
if self._group_id: if self._group_id:
group = palettegroup.get_group(self._group_id) group = palettegroup.get_group(self._group_id)
if group and group.is_up(): if group and group.is_up():