diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-12 23:19:21 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-12 23:19:21 (GMT) |
commit | d041eadf9220ff88e11181ce4d5465f9b07b1a8c (patch) | |
tree | a6a7dcfd4b79ad5f6d4d69467ea78f41f6a979ac /shell/view/Shell.py | |
parent | 2c468110ba6d7a4e5ff95a11f8c6bb26f683eecd (diff) |
Give up on the save/restore logic, it seem too unpredictable to be clear to the user.
Try a simpler logic where the frame state is reset when switching zoom levels.
Diffstat (limited to 'shell/view/Shell.py')
-rw-r--r-- | shell/view/Shell.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 4a2801a..3f0ef8f 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -61,8 +61,6 @@ class Shell(gobject.GObject): activity_host = ActivityHost(home_activity) self._hosts[activity_host.get_xid()] = activity_host - self._frame.hide() - def _activity_removed_cb(self, home_model, home_activity): if not home_activity.get_launched(): return @@ -84,7 +82,7 @@ class Shell(gobject.GObject): if self._current_host: self._current_host.set_active(True) - self._zoom_level = sugar.ZOOM_ACTIVITY + self.set_zoom_level(sugar.ZOOM_ACTIVITY) else: self.set_zoom_level(sugar.ZOOM_HOME) @@ -148,9 +146,6 @@ class Shell(gobject.GObject): if len(self._hosts) == 0 and level == sugar.ZOOM_ACTIVITY: return - if self._zoom_level == sugar.ZOOM_HOME: - self._frame.restore_state() - self._zoom_level = level if self._zoom_level == sugar.ZOOM_ACTIVITY: @@ -160,8 +155,9 @@ class Shell(gobject.GObject): self._home_window.set_zoom_level(self._zoom_level) if self._zoom_level == sugar.ZOOM_HOME: - self._frame.save_state() self._frame.show() + else: + self._frame.hide() def get_current_activity(self): return self._current_host |