diff options
| author | Benjamin Berg <benjamin@sipsolutions.net> | 2008-07-28 22:27:38 (GMT) |
|---|---|---|
| committer | Benjamin Berg <benjamin@sipsolutions.net> | 2008-07-28 22:27:38 (GMT) |
| commit | e75203670fd31c8044d25944e515f84953b7835b (patch) | |
| tree | 3d364917148e0a614deb9c78fc7ae18a2390d096 /src | |
| parent | 8db79a1fdcdc797a84c4e9a7e9d567f03671dfa3 (diff) | |
Use the tabbing activity from the HomeModel in the TabbingHandler.
Diffstat (limited to 'src')
| -rw-r--r-- | src/view/tabbinghandler.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/view/tabbinghandler.py b/src/view/tabbinghandler.py index dd57e6e..03ce275 100644 --- a/src/view/tabbinghandler.py +++ b/src/view/tabbinghandler.py @@ -79,7 +79,7 @@ class TabbingHandler(object): def _activate_current(self): shell_model = shellmodel.get_instance() home_model = shell_model.get_home() - activity = home_model.get_active_activity() + activity = home_model.get_tabbing_activity() if activity and activity.get_window(): activity.get_window().activate(1) @@ -99,9 +99,10 @@ class TabbingHandler(object): if not zoom_activity and first_switch: activity = home_model.get_active_activity() else: - activity = home_model.get_next_activity() + activity = home_model.get_tabbing_activity() + activity = home_model.get_next_activity(current=activity) - home_model.tabbing_set_activity(activity) + home_model.set_tabbing_activity(activity) self._start_timeout() else: view.Shell.get_instance().activate_next_activity() @@ -122,9 +123,10 @@ class TabbingHandler(object): if not zoom_activity and first_switch: activity = home_model.get_active_activity() else: - activity = home_model.get_previous_activity() + activity = home_model.get_tabbing_activity() + activity = home_model.get_previous_activity(current=activity) - home_model.tabbing_set_activity(activity) + home_model.set_tabbing_activity(activity) self._start_timeout() else: view.Shell.get_instance().activate_next_activity() @@ -139,6 +141,9 @@ class TabbingHandler(object): self._cancel_timeout() self._activate_current() + home_model = shellmodel.get_instance().get_home() + home_model.set_tabbing_activity(None) + def is_tabbing(self): return self._tabbing |