diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-09-09 14:50:59 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-09-09 14:50:59 (GMT) |
commit | 089296ec81a1ebafa22be4b80d424b2a1e51788f (patch) | |
tree | cf36189359bbef63dda49c08d83344b6ab1a2eb1 | |
parent | b8e99923ec9b24545214f2076c352e425e4e1038 (diff) |
really fix Alt handling
-rw-r--r-- | src/jarabe/desktop/homebox.py | 13 | ||||
-rw-r--r-- | src/jarabe/desktop/homewindow.py | 12 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py index e79bf22..85279ff 100644 --- a/src/jarabe/desktop/homebox.py +++ b/src/jarabe/desktop/homebox.py @@ -43,9 +43,6 @@ class HomeBox(gtk.VBox): gobject.GObject.__init__(self) - self.connect('visibility-notify-event', - self.__visibility_notify_event_cb) - self._favorites_view = favoritesview.FavoritesView() self._list_view = ActivitiesList() @@ -147,16 +144,6 @@ class HomeBox(gtk.VBox): def set_resume_mode(self, resume_mode): self._favorites_view.set_resume_mode(resume_mode) - def __visibility_notify_event_cb(self, window, event): - if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: - return - - screen_, x_, y_, modmask = gtk.gdk.display_get_default().get_pointer() - if modmask & gtk.gdk.MOD1_MASK: - self.set_resume_mode(False) - else: - self.set_resume_mode(True) - class HomeToolbar(gtk.Toolbar): __gtype_name__ = 'SugarHomeToolbar' diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py index c7e2b8f..8882cec 100644 --- a/src/jarabe/desktop/homewindow.py +++ b/src/jarabe/desktop/homewindow.py @@ -50,6 +50,7 @@ class HomeWindow(gtk.Window): self.realize() self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DESKTOP) + self.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) self.connect('visibility-notify-event', self._visibility_notify_event_cb) self.connect('map-event', self.__map_event_cb) @@ -86,9 +87,16 @@ class HomeWindow(gtk.Window): def _visibility_notify_event_cb(self, window, event): if event.state == gtk.gdk.VISIBILITY_FULLY_OBSCURED: - self._deactivate_view() + self._deactivate_view(shell.get_model().zoom_level) else: - self._activate_view() + display = gtk.gdk.display_get_default() + screen_, x_, y_, modmask = display.get_pointer() + if modmask & gtk.gdk.MOD1_MASK: + self._home_box.set_resume_mode(False) + else: + self._home_box.set_resume_mode(True) + + self._activate_view(shell.get_model().zoom_level) def __key_press_event_cb(self, window, event): if event.keyval in [gtk.keysyms.Alt_L, gtk.keysyms.Alt_R]: |