Merge lp:~voluntatefaber/slingshot/center-switcher into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[Cody Garver (codygarver)]

This branch does not work for me.

http://img641.imageshack.us/img641/8586/slingshotswitcher.png

[Sergey "Shnatsel" Davidoff (shnatsel)]

Works for me.
Before: http://imagebin.org/226004
After: http://imagebin.org/226005

[Cody Garver (codygarver)]

I read "view switcher instead of "page switcher"..

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-08-24 10:06:13 +0000
+++ src/SlingshotView.vala	2012-08-26 16:29:17 +0000
@@ -204,9 +204,9 @@
 
 
             var bottom_separator1 = new Label (""); // A fake label
-            bottom_separator1.set_hexpand(true);
+            bottom_separator1.set_hexpand (true);
             var bottom_separator2 = new Label (""); // A fake label
-            bottom_separator2.set_hexpand(true);
+            bottom_separator2.set_hexpand (true);
             bottom.attach (bottom_separator1, 0, 0, 1, 1); // A fake label
             bottom.attach (page_switcher, 1, 0, 1, 1);
             bottom.attach (bottom_separator2, 2, 0, 1, 1); // A fake label
 
=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2012-08-21 17:02:33 +0000
+++ src/Widgets/CategoryView.vala	2012-08-26 16:29:17 +0000
@@ -141,8 +141,8 @@
             page_switcher.attach (switcher, 1, 0, 1, 1);
             page_switcher.attach (bottom_separator2, 2, 0, 1, 1);
 
-            container.attach (category_switcher, 0, 0, 1, 1);
-            container.attach (separator, 1, 0, 1, 1);
+            container.attach (category_switcher, 0, 0, 1, 2);
+            container.attach (separator, 1, 0, 1, 2);
             container.attach (layout, 2, 0, 1, 1);
 
             add (container);
@@ -320,11 +320,13 @@
 
         public void show_page_switcher (bool show) {
 
-            if (page_switcher.get_parent () == null)
-                view.bottom.attach (page_switcher, 1, 0, 1, 1);
+            if (page_switcher.get_parent () == null) 
+                container.attach (page_switcher, 2, 1, 1, 1);
 
-            if (show)
+            if (show) {
                 page_switcher.show_all ();
+                view.bottom.hide ();
+            }
             else
                 page_switcher.hide ();