diff options
author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-17 12:33:42 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-17 12:33:42 (GMT) |
commit | 499e8fa15e629155e4ee9fd0f219bbf0258f7dc9 (patch) | |
tree | 5d65b9e4cb5e568d08998fee7e69498283b5fe06 /src/jarabe/view | |
parent | 0daeeebc23be80e169e7133d398694d7b5bbe3cb (diff) |
First go at refactoring zoom handling. Includes changes
by benzea for #7675.
Diffstat (limited to 'src/jarabe/view')
-rw-r--r-- | src/jarabe/view/keyhandler.py | 12 | ||||
-rw-r--r-- | src/jarabe/view/launcher.py | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 1e9a890..2b567bf 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -159,20 +159,16 @@ class KeyHandler(object): active_activity.get_window().close() def handle_zoom_mesh(self): - shell.get_model().set_zoom_level(ShellModel.ZOOM_MESH) - wnck.screen_get_default().toggle_showing_desktop(True) + shell.get_model().zoom_level = ShellModel.ZOOM_MESH def handle_zoom_group(self): - shell.get_model().set_zoom_level(ShellModel.ZOOM_GROUP) - wnck.screen_get_default().toggle_showing_desktop(True) + shell.get_model().zoom_level = ShellModel.ZOOM_GROUP def handle_zoom_home(self): - shell.get_model().set_zoom_level(ShellModel.ZOOM_HOME) - wnck.screen_get_default().toggle_showing_desktop(True) + shell.get_model().zoom_level = ShellModel.ZOOM_HOME def handle_zoom_activity(self): - activity = shell.get_model().get_active_activity() - activity.get_window().activate(gtk.get_current_event_time()) + shell.get_model().zoom_level = ShellModel.ZOOM_ACTIVITY def handle_brightness_max(self): self._change_brightness(value=_BRIGHTNESS_MAX) diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py index a8cf72a..b4f1020 100644 --- a/src/jarabe/view/launcher.py +++ b/src/jarabe/view/launcher.py @@ -130,7 +130,6 @@ def __launch_started_cb(home_model, home_activity): launch_window.show() _launchers[home_activity.get_activity_id()] = launch_window - shell.get_model().set_zoom_level(shell.ShellModel.ZOOM_ACTIVITY) def __launch_failed_cb(home_model, home_activity): if not home_activity.is_journal(): |