Merge lp:~vikoadi/audience/audience-slide-animation into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

- slide up/down animation for bottombar and unfullscreen button
- replace allocate_bottombar with Actor Constraint

- slide up/down animation for bottombar and unfullscreen button
- replace allocate_bottombar with Actor Constraint

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2015-06-14 07:02:09 +0000
+++ src/Widgets/BottomBar.vala	2015-11-10 17:24:14 +0000
@@ -47,9 +47,9 @@
         this.enter_notify_event.connect ((event) => { this.hovered = true; return false; });
         this.leave_notify_event.connect ((event) => { this.hovered = false; return false; });
 
-        transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        this.transition_type = Gtk.RevealerTransitionType.SLIDE_UP;
+
         var main_actionbar = new Gtk.ActionBar ();
-        main_actionbar.opacity = GLOBAL_OPACITY;
 
         play_button = new Gtk.Button.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
         play_button.tooltip_text = _("Play");
@@ -113,8 +113,8 @@
 
     public Gtk.Revealer get_unfullscreen_button () {
         unfullscreen_revealer = new Gtk.Revealer ();
-        unfullscreen_revealer.opacity = GLOBAL_OPACITY;
-        unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+
         var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON);
         unfullscreen_button.tooltip_text = _("Unfullscreen");
         unfullscreen_button.clicked.connect (() => {unfullscreen ();});

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2015-10-31 19:47:46 +0000
+++ src/Widgets/PlayerPage.vala	2015-11-10 17:24:14 +0000
@@ -30,8 +30,6 @@
             }
         }
 
-        private int bottom_bar_size = 0;
-
         public signal void ended ();
 
         public PlayerPage () {
@@ -49,7 +47,6 @@
             stage.add_child (video_player);
 
             bottom_bar = new Widgets.BottomBar (video_player);
-            bottom_bar.set_valign (Gtk.Align.END);
             bottom_bar.play_toggled.connect (() => { video_player.playing = !video_player.playing; });
             bottom_bar.seeked.connect ((val) => { video_player.progress = val; });
             bottom_bar.unfullscreen.connect (()=>{set_fullscreen (false);});
@@ -59,10 +56,14 @@
 
             bottom_actor = new GtkClutter.Actor.with_contents (bottom_bar);
             bottom_actor.opacity = GLOBAL_OPACITY;
+            bottom_actor.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
+            bottom_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 1));
             stage.add_child (bottom_actor);
 
             unfullscreen_actor = new GtkClutter.Actor.with_contents (unfullscreen_bar);
             unfullscreen_actor.opacity = GLOBAL_OPACITY;
+            unfullscreen_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.X_AXIS, 1));
+            unfullscreen_actor.add_constraint (new Clutter.AlignConstraint (stage, Clutter.AlignAxis.Y_AXIS, 0));
             stage.add_child (unfullscreen_actor);
 
             this.size_allocate.connect (on_size_allocate);
@@ -210,8 +211,6 @@
                 }
             });
 
-            stage.notify["allocation"].connect (() => {allocate_bottombar ();});
-
             add (clutter);
 
             show_all ();
@@ -332,21 +331,8 @@
             return false;
         }
 
-        private void allocate_bottombar () {
-            bottom_actor.width = stage.get_width ();
-            bottom_bar.queue_resize ();
-            bottom_actor.y = stage.get_height () - bottom_bar_size;
-            unfullscreen_actor.y = 6;
-            unfullscreen_actor.x = stage.get_width () - bottom_bar_size - 6;
-        }
-
         public bool update_pointer_position (double y, int window_height) {
-            allocate_bottombar ();
             App.get_instance ().mainwindow.get_window ().set_cursor (null);
-            if (bottom_bar_size == 0) {
-                int minimum = 0;
-                bottom_bar.get_preferred_height (out minimum, out bottom_bar_size);
-            }
 
             bottom_bar.reveal_control ();