Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
commit
d79db5d172
6
NEWS
6
NEWS
@ -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)
|
||||
* #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)
|
||||
@ -14,6 +19,7 @@ Snapshot e65fef5c79
|
||||
|
||||
Snapshot 23ad88db0c
|
||||
|
||||
* #1986: Add Reboo option in Home View (edsiper)
|
||||
* Re-share an activity when it gets launched from the journal if it was
|
||||
shared before (dcbw)
|
||||
* Update to new tubes API (cassidy)
|
||||
|
@ -327,7 +327,6 @@ class Palette(gtk.Window):
|
||||
self._secondary_anim.start()
|
||||
|
||||
def popdown(self, immediate=False):
|
||||
self._secondary_anim.stop()
|
||||
self._popup_anim.stop()
|
||||
|
||||
if not immediate:
|
||||
@ -350,6 +349,11 @@ class Palette(gtk.Window):
|
||||
|
||||
def _invoker_mouse_enter_cb(self, invoker):
|
||||
immediate = False
|
||||
|
||||
if self.is_up():
|
||||
self._popdown_anim.stop()
|
||||
return
|
||||
|
||||
if self._group_id:
|
||||
group = palettegroup.get_group(self._group_id)
|
||||
if group and group.is_up():
|
||||
|
Loading…
Reference in New Issue
Block a user