From 9876f57bb48a9b9d4d978f2a6c26ac5d4a399bce Mon Sep 17 00:00:00 2001 From: Simon Schampijer Date: Sat, 10 Nov 2012 10:14:55 +0000 Subject: Frame Palette interaction cleanup - add a 'done' signal to the CurrentActivityPalette that is emitted when on item in the Palette is selected, when received in the ActivitiesTray we do hide the Frame - call 'popdown_all' on the PaletteGroup when the Frame is hidden, this makes sure that all the Palettes are popped down in that case - Journal Palette: remove the popdown call when 'show content' is selected, this introduced a race - this fixes as well SL #4171 Signed-off-by: Simon Schampijer Acked-by: Manuel QuiƱones --- (limited to 'src/jarabe/frame/activitiestray.py') diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 5fb1826..f8e15c9 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -84,11 +84,11 @@ class ActivityButton(RadioToolButton): palette = JournalPalette(self._home_activity) else: palette = CurrentActivityPalette(self._home_activity) - palette.connect('popdown', self.__palette_popped_down_cb) + palette.connect('done', self.__palette_item_selected_cb) palette.set_group_id('frame') self.set_palette(palette) - def __palette_popped_down_cb(self, widget): + def __palette_item_selected_cb(self, widget): frame = jarabe.frame.get_view() frame.hide() -- cgit v0.9.1