[sugar] [PATCH] Don't show the frame when switching to the home view.

[Tomeu Vizoso]

From 7d8d1de47e435dd402461f6344fc2bb15d024841 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <[EMAIL PROTECTED]>
Date: Sun, 2 Mar 2008 12:29:28 +0100
Subject: [PATCH] Don't show the frame when switching to the home view.

---
 src/view/Shell.py       |   16 +---------------
 src/view/frame/frame.py |    2 --
 2 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/src/view/Shell.py b/src/view/Shell.py
index 72aa3b1..5c4c75c 100644
--- a/src/view/Shell.py
+++ b/src/view/Shell.py
@@ -58,7 +58,6 @@ class Shell(gobject.GObject):
         self._current_host = None
         self._pending_host = None
         self._screen_rotation = 0
-        self._zoom_level = ShellModel.ZOOM_HOME
 
         self._key_handler = KeyHandler(self)
 
@@ -75,8 +74,6 @@ class Shell(gobject.GObject):
         home_model.connect('pending-activity-changed',
                            self._pending_activity_changed_cb)
 
-        self._model.connect('notify::zoom-level', self._zoom_level_changed_cb)
-
         gobject.idle_add(self._start_journal_idle)
 
     def _start_journal_idle(self):
@@ -189,7 +186,7 @@ class Shell(gobject.GObject):
                     logging.debug('Error raised by TakeScreenshot(): %s', e)
 
     def set_zoom_level(self, level):
-        if level == self._zoom_level:
+        if level == self._model.get_zoom_level():
             return
 
         self.take_activity_screenshot()
@@ -203,17 +200,6 @@ class Shell(gobject.GObject):
             self._screen.toggle_showing_desktop(True)
             self._home_window.set_zoom_level(level)
 
-    def _zoom_level_changed_cb(self, model, pspec):
-        new_level = model.props.zoom_level
-
-        if new_level == ShellModel.ZOOM_HOME:
-            self._frame.show(Frame.MODE_NON_INTERACTIVE)
-
-        if self._zoom_level == ShellModel.ZOOM_HOME:
-            self._frame.hide()
-
-        self._zoom_level = new_level
-
     def toggle_activity_fullscreen(self):
         if self._model.get_zoom_level() == ShellModel.ZOOM_ACTIVITY:
             self.get_current_activity().toggle_fullscreen()
diff --git a/src/view/frame/frame.py b/src/view/frame/frame.py
index 508d1a1..5d06674 100644
--- a/src/view/frame/frame.py
+++ b/src/view/frame/frame.py
@@ -121,8 +121,6 @@ class Frame(object):
         self._key_listener = _KeyListener(self)
         self._mouse_listener = _MouseListener(self)
 
-        self.move(1.0)
-
     def is_visible(self):
         return self.current_position != 0.0
 
-- 
1.5.2.5


_______________________________________________
Sugar mailing list
Sugar@lists.laptop.org
http://lists.laptop.org/listinfo/sugar