Implement the transition between zoom view.
This commit is contained in:
parent
5bfc64d9be
commit
f55a19b73c
@ -19,20 +19,25 @@ import hippo
|
|||||||
import cairo
|
import cairo
|
||||||
|
|
||||||
from sugar.graphics.menushell import MenuShell
|
from sugar.graphics.menushell import MenuShell
|
||||||
|
from sugar.graphics import units
|
||||||
import sugar
|
import sugar
|
||||||
|
|
||||||
from view.home.MeshBox import MeshBox
|
from view.home.MeshBox import MeshBox
|
||||||
from view.home.HomeBox import HomeBox
|
from view.home.HomeBox import HomeBox
|
||||||
from view.home.FriendsBox import FriendsBox
|
from view.home.FriendsBox import FriendsBox
|
||||||
|
from view.home.transitionbox import TransitionBox
|
||||||
|
|
||||||
_HOME_PAGE = 0
|
_HOME_PAGE = 0
|
||||||
_FRIENDS_PAGE = 1
|
_FRIENDS_PAGE = 1
|
||||||
_MESH_PAGE = 2
|
_MESH_PAGE = 2
|
||||||
|
_TRANSITION_PAGE = 3
|
||||||
|
|
||||||
class HomeWindow(gtk.Window):
|
class HomeWindow(gtk.Window):
|
||||||
def __init__(self, shell):
|
def __init__(self, shell):
|
||||||
gtk.Window.__init__(self)
|
gtk.Window.__init__(self)
|
||||||
self._shell = shell
|
self._shell = shell
|
||||||
self._active = False
|
self._active = False
|
||||||
|
self._level = sugar.ZOOM_HOME
|
||||||
|
|
||||||
self.set_default_size(gtk.gdk.screen_width(),
|
self.set_default_size(gtk.gdk.screen_width(),
|
||||||
gtk.gdk.screen_height())
|
gtk.gdk.screen_height())
|
||||||
@ -68,6 +73,15 @@ class HomeWindow(gtk.Window):
|
|||||||
self._nb.append_page(canvas)
|
self._nb.append_page(canvas)
|
||||||
canvas.show()
|
canvas.show()
|
||||||
|
|
||||||
|
canvas = hippo.Canvas()
|
||||||
|
self._transition_box = TransitionBox()
|
||||||
|
canvas.set_root(self._transition_box)
|
||||||
|
self._nb.append_page(canvas)
|
||||||
|
canvas.show()
|
||||||
|
|
||||||
|
self._transition_box.connect('completed',
|
||||||
|
self._transition_completed_cb)
|
||||||
|
|
||||||
def _key_release_cb(self, widget, event):
|
def _key_release_cb(self, widget, event):
|
||||||
keyname = gtk.gdk.keyval_name(event.keyval)
|
keyname = gtk.gdk.keyval_name(event.keyval)
|
||||||
if keyname == "Alt_L":
|
if keyname == "Alt_L":
|
||||||
@ -88,11 +102,25 @@ class HomeWindow(gtk.Window):
|
|||||||
self._update_mesh_state()
|
self._update_mesh_state()
|
||||||
|
|
||||||
def set_zoom_level(self, level):
|
def set_zoom_level(self, level):
|
||||||
|
self._level = level
|
||||||
|
|
||||||
|
self._nb.set_current_page(_TRANSITION_PAGE)
|
||||||
|
|
||||||
if level == sugar.ZOOM_HOME:
|
if level == sugar.ZOOM_HOME:
|
||||||
self._nb.set_current_page(_HOME_PAGE)
|
scale = units.XLARGE_ICON_SCALE
|
||||||
elif level == sugar.ZOOM_FRIENDS:
|
elif level == sugar.ZOOM_FRIENDS:
|
||||||
self._nb.set_current_page(_FRIENDS_PAGE)
|
scale = units.LARGE_ICON_SCALE
|
||||||
elif level == sugar.ZOOM_MESH:
|
elif level == sugar.ZOOM_MESH:
|
||||||
|
scale = units.STANDARD_ICON_SCALE
|
||||||
|
|
||||||
|
self._transition_box.set_scale(scale)
|
||||||
|
|
||||||
|
def _transition_completed_cb(self, transition_box):
|
||||||
|
if self._level == sugar.ZOOM_HOME:
|
||||||
|
self._nb.set_current_page(_HOME_PAGE)
|
||||||
|
elif self._level == sugar.ZOOM_FRIENDS:
|
||||||
|
self._nb.set_current_page(_FRIENDS_PAGE)
|
||||||
|
elif self._level == sugar.ZOOM_MESH:
|
||||||
self._nb.set_current_page(_MESH_PAGE)
|
self._nb.set_current_page(_MESH_PAGE)
|
||||||
|
|
||||||
self._update_mesh_state()
|
self._update_mesh_state()
|
||||||
|
66
shell/view/home/transitionbox.py
Normal file
66
shell/view/home/transitionbox.py
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
# Copyright (C) 2007, Red Hat, Inc.
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
|
import hippo
|
||||||
|
import gobject
|
||||||
|
|
||||||
|
from sugar.graphics import units
|
||||||
|
from sugar.graphics import animator
|
||||||
|
from sugar.graphics.spreadbox import SpreadBox
|
||||||
|
|
||||||
|
from view.home.MyIcon import MyIcon
|
||||||
|
|
||||||
|
class _Animation(animator.Animation):
|
||||||
|
def __init__(self, icon, start_scale, end_scale):
|
||||||
|
animator.Animation.__init__(self, 0.0, 1.0)
|
||||||
|
|
||||||
|
self._icon = icon
|
||||||
|
self.start_scale = start_scale
|
||||||
|
self.end_scale = end_scale
|
||||||
|
|
||||||
|
def next_frame(self, current):
|
||||||
|
d = (self.end_scale - self.start_scale) * current
|
||||||
|
self._icon.props.scale = self.start_scale + d
|
||||||
|
|
||||||
|
class TransitionBox(SpreadBox):
|
||||||
|
__gtype_name__ = 'SugarTransitionBox'
|
||||||
|
|
||||||
|
__gsignals__ = {
|
||||||
|
'completed': (gobject.SIGNAL_RUN_FIRST,
|
||||||
|
gobject.TYPE_NONE, ([]))
|
||||||
|
}
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
SpreadBox.__init__(self, background_color=0xe2e2e2ff)
|
||||||
|
|
||||||
|
self._scale = 0.0
|
||||||
|
|
||||||
|
self._my_icon = MyIcon(units.LARGE_ICON_SCALE)
|
||||||
|
self.set_center_item(self._my_icon)
|
||||||
|
|
||||||
|
self._animator = animator.Animator(0.5, 30)
|
||||||
|
self._animator.connect('completed', self._animation_completed_cb)
|
||||||
|
|
||||||
|
def _animation_completed_cb(self, anim):
|
||||||
|
self.emit('completed')
|
||||||
|
|
||||||
|
def set_scale(self, scale):
|
||||||
|
self._animator.remove_all()
|
||||||
|
self._animator.add(_Animation(self._my_icon, self._scale, scale))
|
||||||
|
self._animator.start()
|
||||||
|
|
||||||
|
self._scale = scale
|
||||||
|
|
@ -39,6 +39,10 @@ class Animator(gobject.GObject):
|
|||||||
def add(self, animation):
|
def add(self, animation):
|
||||||
self._animations.append(animation)
|
self._animations.append(animation)
|
||||||
|
|
||||||
|
def remove_all(self):
|
||||||
|
self.stop()
|
||||||
|
self._animations = []
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
if self._timeout_sid:
|
if self._timeout_sid:
|
||||||
self.stop()
|
self.stop()
|
||||||
@ -51,7 +55,7 @@ class Animator(gobject.GObject):
|
|||||||
if self._timeout_sid:
|
if self._timeout_sid:
|
||||||
gobject.source_remove(self._timeout_sid)
|
gobject.source_remove(self._timeout_sid)
|
||||||
self._timeout_sid = 0
|
self._timeout_sid = 0
|
||||||
self.emit('completed')
|
self.emit('completed')
|
||||||
|
|
||||||
def _next_frame_cb(self):
|
def _next_frame_cb(self):
|
||||||
current_time = min(self._time, time.time() - self._start_time)
|
current_time = min(self._time, time.time() - self._start_time)
|
||||||
|
Loading…
Reference in New Issue
Block a user