Merge lp:~evfool/scratch/lp1173737 into lp:~elementary-apps/scratch/scratch

[Robert Roth]

Move the findbar above the splitview instead of spanning the whole window (lp:1173737)

Moved the findbar to be shown only above the split view, as it doesn't have anything to do with the file browser/source browser (fix lp:1173737).

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2014-05-20 10:58:53 +0000
+++ src/MainWindow.vala	2014-06-04 20:20:27 +0000
@@ -211,7 +211,10 @@
             hp2 = new Granite.Widgets.ThinPaned ();
             vp = new Granite.Widgets.ThinPaned ();
             vp.orientation = Orientation.VERTICAL;
-            
+
+            var content = new Gtk.Box (Orientation.VERTICAL, 0);
+            content.pack_start (search_revealer, false, true, 0);            
+            content.pack_start (split_view, true, true, 0);            
             // Set a proper position for ThinPaned widgets
             int width, height;
             this.get_size (out width, out height);
@@ -221,14 +224,13 @@
             vp.position = (height - 150);
 
             hp1.pack1 (sidebar, false, false);
-            hp1.pack2 (split_view, true, false);
+            hp1.pack2 (content, true, false);
             hp2.pack1 (hp1, true, false);
             hp2.pack2 (contextbar, false, false);
             vp.pack1 (hp2, true, false);
             vp.pack2 (bottombar, false, false);
 
             // Add everything to the window
-            main_box.pack_start (search_revealer, false, true, 0);
             main_box.pack_start (loading_view, true, true, 0);
             main_box.pack_start (vp, false, true, 0);
             this.add (main_box);