Merge lp:~artem-anufrij/audience/Bugfix-1395265 into lp:~audience-members/audience/trunk

[Artem Anufrij]

The bottom bar stays open on mouseover.

The bottom bar stays open on mouseover.

[Raphael Isemann (teemperor)]

One problem:

When you see the preview and the move the mouse to a part of the bottom bar that is not the Gtk.Scale, the bottom bar closes.

Example: If you move the mouse over the Gtk.Scale and then move it to the left to the play/stop-button, the bottom bar will disappear after a few seconds.

If you move from the the middle of the window to the play/stop-button (without waiting on the Gtk.Scale first) it works.

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Thanks for your Feedback! I will fix it.

[Artem Anufrij (artem-anufrij)]

@Raphael:

Could you review it again?

[Danielle Foré (danrabbit)]

It seems like with this branch the UI will only hide once. If I reveal the UI, it will not hide again.

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

Hey Dan,

see my screencast:

https://bugs.launchpad.net/audience/+bug/1395265/+attachment/4274205/+files/Screencast%202014-12-04%2023%3A28%3A56.mp4

It works perfect on my system...

Can you post exactly steps, please?

review: Needs Information (behavior)

[Artem Anufrij (artem-anufrij)]

Dan? ^

[Avi Romanoff (aroman)]

This works on my machine! Nice work :-)

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-11-02 19:13:36 +0000
+++ src/Audience.vala	2014-12-24 13:32:45 +0000
@@ -17,6 +17,7 @@
  *
  * Authored by: Tom Beckmann <[e-mail]>
  *              Cody Garver <[e-mail]>
+ *              Artem Anufrij <[e-mail]>
  */
 
 /*
@@ -616,12 +617,6 @@
             if (bottom_bar.child_revealed == false)
                 bottom_bar.set_reveal_child (true);
 
-            if (y >= (window_height - bottom_bar_size) && y < window_height) {
-                bottom_bar.hovered = true;
-            } else {
-                bottom_bar.hovered = false;
-            }
-
             return false;
         }
 
@@ -854,4 +849,4 @@
     var app = Audience.App.get_instance ();
 
     app.run (args);
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2014-10-31 19:43:35 +0000
+++ src/Widgets/BottomBar.vala	2014-12-24 13:32:45 +0000
@@ -16,6 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Corentin Noël <[e-mail]>
+ *              Artem Anufrij <[e-mail]>
  */
 
 public class Audience.Widgets.BottomBar : Gtk.Revealer {
@@ -36,6 +37,13 @@
     private uint hiding_timer = 0;
 
     public BottomBar () {
+        this.events |= Gdk.EventMask.POINTER_MOTION_MASK;
+        this.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
+        this.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
+
+        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;
         var main_actionbar = new Gtk.ActionBar ();
         main_actionbar.opacity = GLOBAL_OPACITY;
@@ -156,4 +164,4 @@
             return false;
         });
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/TimeWidget.vala'
--- src/Widgets/TimeWidget.vala	2014-06-30 14:54:30 +0000
+++ src/Widgets/TimeWidget.vala	2014-12-24 13:32:45 +0000
@@ -124,4 +124,4 @@
         progression_label.label = seconds_to_time ((int)(current_time / 1000000000));
         time_label.label = seconds_to_time ((int)((total_time - current_time) / 1000000000));
     }
-}
\ No newline at end of file
+}