sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of the notebook which was causing strange flickering.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-04-16 12:26:17 +02:00
parent 1b84784d26
commit f67a243653
4 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/view/frame/frame.py
View File

@ -169,7 +169,7 @@ class Frame(object):
if self._animator: if self._animator:
self._animator.stop() self._animator.stop()
self._animator = animator.Animator(0.5, 30, animator.EASE_OUT_EXPO) self._animator = animator.Animator(0.5)
self._animator.add(_Animation(self, 0.0)) self._animator.add(_Animation(self, 0.0))
self._animator.start() self._animator.start()
@ -188,7 +188,7 @@ class Frame(object):
if self._animator: if self._animator:
self._animator.stop() self._animator.stop()
self._animator = animator.Animator(0.5, 30, animator.EASE_OUT_EXPO) self._animator = animator.Animator(0.5)
self._animator.add(_Animation(self, 1.0)) self._animator.add(_Animation(self, 1.0))
self._animator.start() self._animator.start()

47
shell/view/home/HomeWindow.py
View File

@ -19,6 +19,7 @@ import hippo
import cairo import cairo
from sugar.graphics.menushell import MenuShell from sugar.graphics.menushell import MenuShell
from sugar.graphics.window import Window
from sugar.graphics import units from sugar.graphics import units
import sugar import sugar
@ -32,9 +33,9 @@ _FRIENDS_PAGE = 1
_MESH_PAGE = 2 _MESH_PAGE = 2
_TRANSITION_PAGE = 3 _TRANSITION_PAGE = 3
class HomeWindow(gtk.Window): class HomeWindow(Window):
def __init__(self, shell): def __init__(self, shell):
gtk.Window.__init__(self) Window.__init__(self)
self._shell = shell self._shell = shell
self._active = False self._active = False
self._level = sugar.ZOOM_HOME self._level = sugar.ZOOM_HOME
@ -48,36 +49,12 @@ class HomeWindow(gtk.Window):
self.connect('focus-in-event', self._focus_in_cb) self.connect('focus-in-event', self._focus_in_cb)
self.connect('focus-out-event', self._focus_out_cb) self.connect('focus-out-event', self._focus_out_cb)
self._nb = gtk.Notebook()
self._nb.set_show_border(False)
self._nb.set_show_tabs(False)
self.add(self._nb)
self._nb.show()
canvas = hippo.Canvas()
self._home_box = HomeBox(shell) self._home_box = HomeBox(shell)
canvas.set_root(self._home_box) self._friends_box = FriendsBox(shell, MenuShell(self))
self._nb.append_page(canvas) self._mesh_box = MeshBox(shell, MenuShell(self))
canvas.show()
canvas = hippo.Canvas()
box = FriendsBox(shell, MenuShell(canvas))
canvas.set_root(box)
self._nb.append_page(canvas)
canvas.show()
canvas = hippo.Canvas()
self._mesh_box = MeshBox(shell, MenuShell(canvas))
canvas.set_root(self._mesh_box)
self._nb.append_page(canvas)
canvas.show()
canvas = hippo.Canvas()
self._transition_box = TransitionBox() self._transition_box = TransitionBox()
canvas.set_root(self._transition_box)
self._nb.append_page(canvas) self.set_root(self._home_box)
canvas.show()
self._transition_box.connect('completed', self._transition_box.connect('completed',
self._transition_completed_cb) self._transition_completed_cb)
@ -88,7 +65,7 @@ class HomeWindow(gtk.Window):
self._home_box.release() self._home_box.release()
def _update_mesh_state(self): def _update_mesh_state(self):
if self._active and self._nb.get_current_page() == _MESH_PAGE: if self._active and self._level == sugar.ZOOM_MESH:
self._mesh_box.resume() self._mesh_box.resume()
else: else:
self._mesh_box.suspend() self._mesh_box.suspend()
@ -104,7 +81,7 @@ class HomeWindow(gtk.Window):
def set_zoom_level(self, level): def set_zoom_level(self, level):
self._level = level self._level = level
self._nb.set_current_page(_TRANSITION_PAGE) self.set_root(self._transition_box)
if level == sugar.ZOOM_HOME: if level == sugar.ZOOM_HOME:
scale = units.XLARGE_ICON_SCALE scale = units.XLARGE_ICON_SCALE
@ -117,11 +94,11 @@ class HomeWindow(gtk.Window):
def _transition_completed_cb(self, transition_box): def _transition_completed_cb(self, transition_box):
if self._level == sugar.ZOOM_HOME: if self._level == sugar.ZOOM_HOME:
self._nb.set_current_page(_HOME_PAGE) self.set_root(self._home_box)
elif self._level == sugar.ZOOM_FRIENDS: elif self._level == sugar.ZOOM_FRIENDS:
self._nb.set_current_page(_FRIENDS_PAGE) self.set_root(self._friends_box)
elif self._level == sugar.ZOOM_MESH: elif self._level == sugar.ZOOM_MESH:
self._nb.set_current_page(_MESH_PAGE) self.set_root(self._mesh_box)
self._update_mesh_state() self._update_mesh_state()

2
shell/view/home/transitionbox.py
View File

@ -51,7 +51,7 @@ class TransitionBox(SpreadBox):
self._my_icon = MyIcon(self._scale) self._my_icon = MyIcon(self._scale)
self.set_center_item(self._my_icon) self.set_center_item(self._my_icon)
self._animator = animator.Animator(0.3, 30) self._animator = animator.Animator(0.3)
self._animator.connect('completed', self._animation_completed_cb) self._animator.connect('completed', self._animation_completed_cb)
def _animation_completed_cb(self, anim): def _animation_completed_cb(self, anim):

2
sugar/graphics/animator.py
View File

@ -28,7 +28,7 @@ class Animator(gobject.GObject):
gobject.TYPE_NONE, ([])), gobject.TYPE_NONE, ([])),
} }
def __init__(self, time, fps, easing=EASE_OUT_EXPO): def __init__(self, time, fps=20, easing=EASE_OUT_EXPO):
gobject.GObject.__init__(self) gobject.GObject.__init__(self)
self._animations = [] self._animations = []
self._time = time self._time = time