Merge lp:~victored/pantheon-files/lp-1309714 into lp:~elementary-apps/pantheon-files/trunk

[Victor Martinez]

Use GraniteOverlayBar for floating statusbar.

This deprecates the "files-overlay-bar" style class and removes duplicate code. Fixes lp:1309714

Use GraniteOverlayBar for floating statusbar.

This deprecates the "files-overlay-bar" style class and removes duplicate code. Fixes lp:1309714

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2013-12-21 01:56:36 +0000
+++ src/View/OverlayBar.vala	2014-04-18 19:53:11 +0000
@@ -18,20 +18,7 @@
 
 namespace Marlin.View {
 
-    public class OverlayBar : Gtk.EventBox {
-
-        private const string FALLBACK_THEME = """
-       .files-overlay-bar {
-           background-color: @bg_color;
-           border-radius: 3px 3px 0 0;
-           padding: 3px 6px 3px 6px;
-           margin: 1px;
-           border-style: solid;
-           border-width: 1px;
-           border-color: darker (@bg_color);
-       }""";
-
-        public Gtk.Label status;
+    public class OverlayBar : Granite.Widgets.OverlayBar {
         private Marlin.View.Window window;
 
         const int IMAGE_LOADER_BUFFER_SIZE = 8192;
@@ -50,28 +37,12 @@
             }
         }
 
-        public OverlayBar (Marlin.View.Window win)
+        public OverlayBar (Marlin.View.Window win, Gtk.Overlay overlay)
         {
+            base (overlay);
+
             window = win;
 
-            visible_window = false;
-
-            status = new Gtk.Label (null);
-            status.set_ellipsize (Pango.EllipsizeMode.END);
-            add (status);
-            status.show ();
-
-            set_halign (Gtk.Align.END);
-            set_valign (Gtk.Align.END);
-
-            set_default_style ();
-
-            var ctx = get_style_context ();
-            ctx.changed.connect (update_spacing);
-            ctx.changed.connect_after (queue_resize);
-
-            update_spacing ();
-
             window.selection_changed.connect (update);
             window.item_hovered.connect (update_hovered);
 
@@ -82,92 +53,6 @@
             });
         }
 
-        public override void parent_set (Gtk.Widget? old_parent)
-        {
-            Gtk.Widget parent = get_parent ();
-
-            if (old_parent != null)
-                old_parent.enter_notify_event.disconnect (enter_notify_callback);
-            if (parent != null)
-                parent.enter_notify_event.connect (enter_notify_callback);
-        }
-
-        public override bool draw (Cairo.Context cr)
-        {
-            var ctx = get_style_context ();
-            ctx.render_background (cr, 0, 0, get_allocated_width (), get_allocated_height ());
-            ctx.render_frame (cr, 0, 0, get_allocated_width (), get_allocated_height ());
-            return base.draw (cr);
-        }
-
-        public override Gtk.SizeRequestMode get_request_mode ()
-        {
-            return Gtk.SizeRequestMode.HEIGHT_FOR_WIDTH;
-        }
-
-        public override void get_preferred_width (out int minimum_width, out int natural_width)
-        {
-            Gtk.Requisition label_min_size, label_natural_size;
-            status.get_preferred_size (out label_min_size, out label_natural_size);
-
-            var ctx = get_style_context ();
-            var state = ctx.get_state ();
-            var border = ctx.get_border (state);
-
-            int extra_allocation = border.left + border.right;
-            minimum_width = extra_allocation + label_min_size.width;
-            natural_width = extra_allocation + label_natural_size.width;
-        }
-
-        public override void get_preferred_height_for_width (int width, out int minimum_height,
-                                                             out int natural_height)
-        {
-            Gtk.Requisition label_min_size, label_natural_size;
-            status.get_preferred_size (out label_min_size, out label_natural_size);
-
-            var ctx = get_style_context ();
-            var state = ctx.get_state ();
-            var border = ctx.get_border (state);
-
-            int extra_allocation = border.top + border.bottom;
-            minimum_height = extra_allocation + label_min_size.height;
-            natural_height = extra_allocation + label_natural_size.height;
-        }
-
-        private void update_spacing ()
-        {
-            var ctx = get_style_context ();
-            var state = ctx.get_state ();
-
-            var padding = ctx.get_padding (state);
-            status.margin_top = padding.top;
-            status.margin_bottom = padding.bottom;
-            status.margin_left = padding.left;
-            status.margin_right = padding.right;
-
-            var margin = ctx.get_margin (state);
-            margin_top = margin.top;
-            margin_bottom = margin.bottom;
-            margin_left = margin.left;
-            margin_right = margin.right;
-        }
-
-        private void set_default_style ()
-        {
-            int priority = Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK;
-            Granite.Widgets.Utils.set_theming (this, FALLBACK_THEME, "files-overlay-bar", priority);
-        }
-
-        private bool enter_notify_callback (Gdk.EventCrossing event)
-        {
-            message ("enter_notify_event");
-            if (get_halign () == Gtk.Align.START)
-                set_halign (Gtk.Align.END);
-            else
-                set_halign (Gtk.Align.START);
-            return false;
-        }
-
         private uint count = 0;
         private uint folders_count = 0;
         private uint files_count = 0;
@@ -217,7 +102,7 @@
 
             } else {
                 visible = false;
-                status.set_label ("");
+                status = "";
             }
         }
 
@@ -231,7 +116,7 @@
 
             if (count == 1) {
                 if (goffile.is_network_uri_scheme ()) {
-                    status.set_label (goffile.get_display_target_uri ());
+                    status = goffile.get_display_target_uri ();
                 } else if (!goffile.is_folder ()) {
 
                     /* if we have an image, see if we can get its resolution */
@@ -240,9 +125,9 @@
                         load_resolution.begin (goffile);
                     }
 
-                    status.set_label ("%s (%s)".printf (goffile.formated_type, goffile.format_size));
+                    status = "%s (%s)".printf (goffile.formated_type, goffile.format_size);
                 } else {
-                    status.set_label ("%s - %s".printf (goffile.info.get_name (), goffile.formated_type));
+                    status = "%s - %s".printf (goffile.info.get_name (), goffile.formated_type);
 
                 }
             } else {
@@ -275,7 +160,7 @@
                     str = _("%u items selected (%s)").printf (count, format_size ((int64) files_size));
                 }
 
-                status.set_label (str);
+                status = str;
 
             }
         }
@@ -309,7 +194,7 @@
 
                 loader.size_prepared.connect ((width, height) => {
                     image_size_loaded = true;
-                    status.set_label ("%s (%s — %i × %i)".printf (goffile.formated_type, goffile.format_size, width, height));
+                    status = "%s (%s — %i × %i)".printf (goffile.formated_type, goffile.format_size, width, height);
                 });
 
                 /* Gdk wants us to always close the loader, so we are nice to it */

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2014-01-07 22:25:32 +0000
+++ src/View/ViewContainer.vala	2014-04-18 19:53:11 +0000
@@ -45,7 +45,7 @@
 
         public ViewContainer (Marlin.View.Window win, GLib.File location, int _view_mode = 0) {
             window = win;
-            overlay_statusbar = new OverlayBar (win);
+            overlay_statusbar = new OverlayBar (win, this);
             view_mode = _view_mode;
 
             /* set active tab */