Merge lp:~eyelash/slingshot/fix-873587 into lp:~elementary-pantheon/slingshot/trunk

[eyelash]

fix Bug #873587

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-04-23 17:41:00 +0000
+++ src/SlingshotView.vala	2012-04-25 09:10:29 +0000
@@ -591,6 +591,12 @@
                     view_manager.move (search_view, -130*columns, 0);
                     view_manager.move (category_view, 130*columns, 0);
                     view_manager.move (grid_view, current_position, 0);
+                    
+                    // change the paddings/margins back to normal
+                    get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE + 5);
+                    center.set_margin_left (12);
+                    top.set_margin_left (12);
+                    view_manager.set_size_request (default_columns*130, default_rows*145);
                     return;
 
                 case Modality.CATEGORY_VIEW:
@@ -603,6 +609,12 @@
                     view_manager.move (grid_view, columns*130, 0);
                     view_manager.move (search_view, -columns*130, 0);
                     view_manager.move (category_view, 0, 0);
+                    
+                    // remove the padding/margin on the left
+                    get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE);
+                    center.set_margin_left (0);
+                    top.set_margin_left (17);
+                    view_manager.set_size_request (default_columns*130 + 17, default_rows*145);
                     return;
 
                 case Modality.SEARCH_VIEW:
@@ -611,6 +623,12 @@
                     view_manager.move (grid_view, columns*130, 0); // Move the grid_view away
                     view_manager.move (category_view, columns*130, 0);
                     view_manager.move (search_view, 0, 0); // Show the searchview
+                    
+                    // change the paddings/margins back to normal
+                    get_content_area ().set_margin_left (PADDINGS.left + SHADOW_SIZE + 5);
+                    center.set_margin_left (12);
+                    top.set_margin_left (12);
+                    view_manager.set_size_request (default_columns*130, default_rows*145);
                     return;
 
             }

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2011-11-11 15:20:28 +0000
+++ src/Utils.vala	2012-04-25 09:10:29 +0000
@@ -24,17 +24,14 @@
 
     class Utils : GLib.Object {
 
-        public static Alignment set_padding (Gtk.Widget widget, int top, 
+        public static Widget set_padding (Gtk.Widget widget, int top, 
                                              int right, int bottom, int left) {
 
-            var alignment = new Alignment (0.0f, 0.0f, 1.0f, 1.0f);
-            alignment.top_padding = top;
-            alignment.right_padding = right;
-            alignment.bottom_padding = bottom;
-            alignment.left_padding = left;
-
-            alignment.add (widget);
-            return alignment;
+            widget.set_margin_top (top);
+            widget.set_margin_right (right);
+            widget.set_margin_bottom (bottom);
+            widget.set_margin_left (left);
+            return widget;
 
         }
   

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2012-04-23 17:41:00 +0000
+++ src/Widgets/CategoryView.vala	2012-04-25 09:10:29 +0000
@@ -54,7 +54,7 @@
 
             category_switcher.selected = 0;
 
-            set_size_request (view.columns*130, view.view_height);
+            set_size_request (view.columns*130 + 17, view.view_height);
 
         }
 

=== modified file 'src/Widgets/Sidebar.vala'
--- src/Widgets/Sidebar.vala	2012-04-23 14:41:40 +0000
+++ src/Widgets/Sidebar.vala	2012-04-25 09:10:29 +0000
@@ -69,12 +69,13 @@
             set_show_expanders (false);
             set_level_indentation (8);
 
-            set_size_request (130, -1);
+            set_size_request (145, -1);
             get_style_context ().add_class ("sidebar");
 
             var cell = new CellRendererText ();
             cell.wrap_mode = Pango.WrapMode.WORD;
             cell.wrap_width = 110;
+            cell.xpad = 17;
 
             insert_column_with_attributes (-1, "Filters", cell, "markup", Columns.TEXT);