Entertainer Media Center

Merge lp:~jamiebennett/entertainer/bug-584914-transition-fixes into lp:entertainer

  1. bug-584914-transition-fixes
  2. Merge into trunk
Proposed by Jamie Bennett
Status: Merged
Approved by: Matt Layman
Approved revision: 413
Merged at revision: 413
Proposed branch: lp:~jamiebennett/entertainer/bug-584914-transition-fixes
Merge into: lp:entertainer
Diff against target: 73 lines (+12/-12)
2 files modified
entertainerlib/gui/transitions/fade.py (+4/-4)
entertainerlib/gui/transitions/zoom_and_fade.py (+8/-8)
To merge this branch: bzr merge lp:~jamiebennett/entertainer/bug-584914-transition-fixes
Reviewer Review Type Date Requested Status
Matt Layman Approve
Review via email: mp+25891@code.launchpad.net

Description of the change

Fix transitions to use the newer clutter API.

To post a comment you must log in.
Revision history for this message
Matt Layman (mblayman) wrote :

Looks good to me. I must have missed this when I was upgrading stuff to the 1.0 clutter API. Clearly I got the slide one but forgot about the other transitions.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'entertainerlib/gui/transitions/fade.py'
2--- entertainerlib/gui/transitions/fade.py 2009-05-10 17:36:49 +0000
3+++ entertainerlib/gui/transitions/fade.py 2010-05-24 13:10:50 +0000
4@@ -32,8 +32,8 @@
5
6 # Fade out current screen
7 if from_screen is not None:
8- fade_out = clutter.Timeline(20, 60)
9- alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)
10+ fade_out = clutter.Timeline(300)
11+ alpha_out = clutter.Alpha(fade_out, clutter.EASE_OUT_SINE)
12 self.out_behaviour = clutter.BehaviourOpacity(0xff, 0x00, alpha_out)
13 self.out_behaviour.apply(from_screen)
14
15@@ -43,8 +43,8 @@
16 from_screen)
17
18 # Fade in timeline
19- fade_in = clutter.Timeline(20, 60)
20- alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
21+ fade_in = clutter.Timeline(300)
22+ alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_SINE)
23 self.in_behaviour = clutter.BehaviourOpacity(0x00, 0xff, alpha_in)
24 self.in_behaviour.apply(to_screen)
25
26
27=== modified file 'entertainerlib/gui/transitions/zoom_and_fade.py'
28--- entertainerlib/gui/transitions/zoom_and_fade.py 2009-05-10 17:36:49 +0000
29+++ entertainerlib/gui/transitions/zoom_and_fade.py 2010-05-24 13:10:50 +0000
30@@ -34,8 +34,8 @@
31
32 # Fade out current screen
33 if from_screen is not None:
34- fade_out = clutter.Timeline(22, 85)
35- alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)
36+ fade_out = clutter.Timeline(300)
37+ alpha_out = clutter.Alpha(fade_out, clutter.EASE_OUT_SINE)
38 self.out_fade = clutter.BehaviourOpacity(255, 0, alpha_out)
39 self.out_fade.apply(from_screen)
40 #from_screen.set_anchor_point_from_gravity(
41@@ -46,8 +46,8 @@
42 self.out_zoom.apply(from_screen)
43
44 # Fade in timeline
45- fade_in = clutter.Timeline(22, 85)
46- alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
47+ fade_in = clutter.Timeline(300)
48+ alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_SINE)
49 self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
50 self.in_behaviour.apply(to_screen)
51 #to_screen.set_anchor_point_from_gravity(
52@@ -73,8 +73,8 @@
53 to_screen.show()
54
55 # Fade out current screen
56- fade_out = clutter.Timeline(22, 85)
57- alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)
58+ fade_out = clutter.Timeline(300)
59+ alpha_out = clutter.Alpha(fade_out, clutter.EASE_OUT_SINE)
60 self.out_fade = clutter.BehaviourOpacity(255, 0, alpha_out)
61 self.out_fade.apply(from_screen)
62 #from_screen.set_anchor_point_from_gravity(
63@@ -85,8 +85,8 @@
64 from_screen)
65
66 # Fade in timeline
67- fade_in = clutter.Timeline(22, 85)
68- alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
69+ fade_in = clutter.Timeline(300)
70+ alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_SINE)
71 self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
72 self.in_behaviour.apply(to_screen)
73 #to_screen.set_anchor_point_from_gravity(

Subscribers

People subscribed via source and target branches