Merge lp:~jeremywootten/pantheon-files/fix-debian-build into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

This branch fixes some mistakes in ./src/CMakeLists.txt that prevented the package compiling if Unity and Plank were absent (e.g. under Debian Sid).

It also fixes an issue with the drawing of breadcrumbs under different themes causing the outline to be drawn inaccurately.

[Cody Garver (codygarver)]

Looks good but I made some diff comments about indention.

=== modified file 'libwidgets/Chrome/BasicBreadcrumbsEntry.vala'
--- libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2016-07-02 10:10:57 +0000
+++ libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2016-07-20 14:21:51 +0000
@@ -584,8 +584,10 @@
             double height = get_allocated_height ();
             double width = get_allocated_width ();
 
+            Gtk.Border border = this.get_style_context ().get_margin (Gtk.StateFlags.ACTIVE);
+
             if (!is_focus) {
-                double margin = YPAD;
+                double margin = border.top;
 
                 /* Ensure there is an editable area to the right of the breadcrumbs */
                 double width_marged = width - 2 * margin - MINIMUM_LOCATION_BAR_ENTRY_WIDTH - ICON_WIDTH;

=== modified file 'libwidgets/Chrome/BreadcrumbElement.vala'
--- libwidgets/Chrome/BreadcrumbElement.vala	2016-06-11 12:06:50 +0000
+++ libwidgets/Chrome/BreadcrumbElement.vala	2016-07-20 14:21:51 +0000
@@ -89,8 +89,9 @@
 
     public double draw (Cairo.Context cr, double x, double y, double height, Gtk.StyleContext button_context, bool is_RTL, Gtk.Widget widget) {
         var state = button_context.get_state ();
-        if (pressed)
+        if (pressed) {
             state |= Gtk.StateFlags.ACTIVE;
+        }
 
         padding = button_context.get_padding (state);
         double line_width = cr.get_line_width ();
@@ -128,8 +129,8 @@
                 room_for_text = false;
             }
         }
+
         /* Erase area for drawing */
-
         if (offset > 0.0) {
             double x_frame_width, x_half_height, x_frame_width_half_height;
             if (is_RTL) {
@@ -165,9 +166,11 @@
                 right_x = base_x + frame_width + line_width;
                 arrow_right_x = right_x + half_height;
             }
+
             var top_y = y + padding.top - line_width;
             var bottom_y = y_height - padding.bottom + line_width;
             var arrow_y = y_half_height;
+
             cr.move_to (left_x, top_y);
             cr.line_to (base_x, arrow_y);
             cr.line_to (left_x, bottom_y);
@@ -180,7 +183,7 @@
             button_context.save ();
             button_context.set_state (Gtk.StateFlags.ACTIVE);
             button_context.render_background (cr, left_x, y, width + height + 2 * line_width, height);
-            button_context.render_frame (cr, 0, padding.top - line_width, widget.get_allocated_width (), height - line_width);
+            button_context.render_frame (cr, 0, y, widget.get_allocated_width (), height);
             button_context.restore ();
             cr.restore ();
         }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-06-29 18:56:26 +0000
+++ src/CMakeLists.txt	2016-07-20 14:21:51 +0000
@@ -13,22 +13,45 @@
 
 find_package (PkgConfig)
 
-pkg_check_modules (DEPS REQUIRED
-    granite>=0.3.0
-    glib-2.0>=2.29.0
-    gthread-2.0
-    gio-2.0
-    gio-unix-2.0
-    pango>=1.1.2
-    gtk+-3.0>=3.14
-    gmodule-2.0
-    gail-3.0
-    gee-0.8
-    sqlite3
-    dbus-glib-1
-    libcanberra>=0.30
-    plank
+
+
+OPTION (WITH_UNITY "Add Unity launcher support" ON)
+pkg_check_modules (UNITY unity>=4.0.0)
+
+if (WITH_UNITY AND UNITY_FOUND)
+pkg_check_modules (DEPS REQUIRED
+    granite>=0.3.0
+    glib-2.0>=2.29.0
+    gthread-2.0
+    gio-2.0
+    gio-unix-2.0
+    pango>=1.1.2
+    gtk+-3.0>=3.14
+    gmodule-2.0
+    gail-3.0
+    gee-0.8
+    sqlite3
+    dbus-glib-1
+    libcanberra>=0.30
+    zeitgeist-2.0
+    plank)
+else (WITH_UNITY AND UNITY_FOUND)
+pkg_check_modules (DEPS REQUIRED
+    granite>=0.3.0
+    glib-2.0>=2.29.0
+    gthread-2.0
+    gio-2.0
+    gio-unix-2.0
+    pango>=1.1.2
+    gtk+-3.0>=3.14
+    gmodule-2.0
+    gail-3.0
+    gee-0.8
+    sqlite3
+    dbus-glib-1
+    libcanberra>=0.30
     zeitgeist-2.0)
+endif (WITH_UNITY AND UNITY_FOUND)
 
 pkg_check_modules(PLANK011 QUIET plank>=0.10.9)
 if (PLANK011_FOUND)
@@ -46,8 +69,7 @@
 link_directories (${LIB_PATHS})
 add_definitions (${CFLAGS} -O2)
 
-OPTION (WITH_UNITY "Add Unity launcher support" ON)
-pkg_check_modules (UNITY unity>=4.0.0)
+
 
 IF (WITH_UNITY AND UNITY_FOUND)
     vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
@@ -88,12 +110,12 @@
         gee-0.8
         granite
         unity
+        plank
         pantheon-files-core
         pantheon-files-core-C
         pantheon-files-widgets
         marlin
         zeitgeist-2.0
-        plank
     GENERATE_HEADER
         marlin-vala
     OPTIONS
@@ -117,6 +139,7 @@
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
         TextRenderer.vala
+        View/AbstractPropertiesDialog.vala
         View/ColumnView.vala
         View/AbstractTreeView.vala
         View/IconView.vala
@@ -133,6 +156,7 @@
         View/Sidebar.vala
         View/Slot.vala
         View/Miller.vala
+        View/VolumePropertiesWindow.vala
     PACKAGES
         gtk+-3.0
         gio-2.0
@@ -145,7 +169,6 @@
         pantheon-files-widgets
         marlin
         zeitgeist-2.0
-        plank
     GENERATE_HEADER
         marlin-vala
     OPTIONS

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2016-06-25 12:31:22 +0000
+++ src/View/Sidebar.vala	2016-07-20 14:21:51 +0000
@@ -858,21 +858,23 @@
         private bool drag_failed_callback (Gdk.DragContext context, Gtk.DragResult result) {
             int x, y;
             Gdk.Device device;
-#if HAVE_PLANK_0_11
-            Plank.PoofWindow poof_window;
-#else
-            Plank.Widgets.PoofWindow poof_window;
-#endif
 
             if (internal_drag_started && dragged_out_of_window) {
                 device = context.get_device ();
                 device.get_position (null, out x, out y);
+
+#if HAVE_UNITY
+
 #if HAVE_PLANK_0_11
+                Plank.PoofWindow poof_window;
                 poof_window = Plank.PoofWindow.get_default ();
 #else
+                Plank.Widgets.PoofWindow? poof_window = null;
                 poof_window = Plank.Widgets.PoofWindow.get_default ();
 #endif
                 poof_window.show_at (x, y);
+#endif
+
                 if (drag_row_ref != null) {
                     Gtk.TreeIter iter;
                     store.get_iter (out iter, drag_row_ref.get_path ());