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

[Paulo Galardi]

[lp:~alekasethm-deactivatedaccount/slingshot/fix-873587]

136. By Paulo Galardi on 2012-02-26

changed the paddings accordingly to fix the bug, and fixed the grid to match the changes

[Victor Martinez (victored)]

Paulo, although this branch has some nice spacing improvements, it does not fix the bug [lp:873587].

review: Needs Fixing

[Victor Martinez (victored)]

review: Disapprove

Unmerged revisions

136. By Paulo Galardi on 2012-02-26

changed the paddings accordingly to fix the bug, and fixed the grid to match the changes

135. By Paulo Galardi on 2012-02-26

changed the paddings accordingly to fix the bug

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-01-21 16:06:26 +0000
+++ src/SlingshotView.vala	2012-02-26 20:43:17 +0000
@@ -76,7 +76,7 @@
 
         public int view_height {
             get {
-                return (int) (rows*130 + rows*grid_view.row_spacing + 35);
+                return (int) (rows*140 + rows*grid_view.row_spacing + 35);
             }
         }
 
@@ -90,7 +90,7 @@
 
             // Have the window in the right place
             read_settings (true);
-            height_request = default_rows * 145 + 180;
+            height_request = default_rows * 155 + 180;
 
             Slingshot.icon_theme = IconTheme.get_default ();
 
@@ -132,7 +132,7 @@
             center = new HBox (false, 0);
             // Create the layout which works like view_manager
             view_manager = new Layout (null, null);
-            view_manager.set_size_request (default_columns*130, default_rows*145);
+            view_manager.set_size_request (default_columns*140, default_rows*135);
             center.pack_end (view_manager, true, true, 0);
 
             // Create the "NORMAL_VIEW"
@@ -144,11 +144,11 @@
             foreach (ArrayList<App> app_list in apps.values) {
                 search_view.add_apps (app_list);
             }
-            view_manager.put (search_view, -columns*130, 0);
+            view_manager.put (search_view, -columns*140, 0);
 
             // Create the "CATEGORY_VIEW"
             category_view = new CategoryView (this);
-            view_manager.put (category_view, -columns*130, 0);
+            view_manager.put (category_view, -columns*140, 0);
 
             // Create the page switcher
             page_switcher = new Switcher ();
@@ -480,10 +480,10 @@
 
             if (current_position < 0) {
                 int count = 0;
-                int val = columns*130*step / 10;
+                int val = columns*140*step / 10;
                 Timeout.add (20 / (2*step*step), () => {
 
-                    if (count >= columns*130*step) {
+                    if (count >= columns*140*step) {
                         count = 0;
                         return false;
                     }
@@ -505,10 +505,10 @@
 
             if ((- current_position) < (grid_view.n_columns*130)) {
                 int count = 0;
-                int val = columns*130*step / 10;
+                int val = columns*140*step / 10;
                 Timeout.add (20 / (2*step*step), () => {
 
-                    if (count >= columns*130*step) {
+                    if (count >= columns*140*step) {
                         count = 0;
                         return false;
                     }
@@ -553,8 +553,8 @@
                     view_selector.show_all ();
                     page_switcher.show_all ();
                     category_view.show_page_switcher (false);
-                    view_manager.move (search_view, -130*columns, 0);
-                    view_manager.move (category_view, 130*columns, 0);
+                    view_manager.move (search_view, -140*columns, 0);
+                    view_manager.move (category_view, 140*columns, 0);
                     view_manager.move (grid_view, current_position, 0);
                     return;
 
@@ -563,16 +563,16 @@
                     view_selector.show_all ();
                     page_switcher.hide ();
                     category_view.show_page_switcher (true);
-                    view_manager.move (grid_view, columns*130, 0);
-                    view_manager.move (search_view, -columns*130, 0);
+                    view_manager.move (grid_view, columns*140, 0);
+                    view_manager.move (search_view, -columns*140, 0);
                     view_manager.move (category_view, 0, 0);
                     return;
 
                 case Modality.SEARCH_VIEW:
                     view_selector.hide ();
                     bottom.hide (); // Hide the switcher
-                    view_manager.move (grid_view, columns*130, 0); // Move the grid_view away
-                    view_manager.move (category_view, columns*130, 0);
+                    view_manager.move (grid_view, columns*140, 0); // Move the grid_view away
+                    view_manager.move (category_view, columns*140, 0);
                     view_manager.move (search_view, 0, 0); // Show the searchview
                     return;
 

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2012-02-25 13:09:13 +0000
+++ src/Widgets/AppEntry.vala	2012-02-26 20:43:17 +0000
@@ -46,7 +46,7 @@
             
             app_paintable = true;
 			set_visual (get_screen ().get_rgba_visual());
-            set_size_request (130, 130);
+            set_size_request (140, 140);
             desktop_id = app.desktop_id;
             desktop_path = app.desktop_path;
             

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2011-11-27 16:25:34 +0000
+++ src/Widgets/CategoryView.vala	2012-02-26 20:43:17 +0000
@@ -51,7 +51,7 @@
 
             category_switcher.selected = 0;
 
-            set_size_request (view.columns*130, view.view_height);
+            set_size_request (view.columns*140, view.view_height);
 
         }
 
@@ -78,7 +78,7 @@
 
             app_view = new Widgets.Grid (view.rows, view.columns - 1);
             layout.put (app_view, 0, 0);
-            layout.put (empty_cat_label, view.columns*130, view.rows * 130 / 2);
+            layout.put (empty_cat_label, view.columns*140, view.rows * 130 / 2);
 
             // Create the page switcher
             switcher = new Switcher ();
@@ -177,21 +177,21 @@
             if (category == MOST_USED_APPS) {
 
                 var apps = view.app_system.get_apps_by_popularity ();
-                layout.move (empty_cat_label, view.columns*130, view.rows*130 / 2);
+                layout.move (empty_cat_label, view.columns*140, view.rows*130 / 2);
                 for (int i = 0; i < 12; i++)
                     add_app (apps.nth_data (i));
 
             } else if (category == NEW_FILTER) {
 
                 // This needs to be implemented
-                layout.move (empty_cat_label, (view.columns - 2)*130/2, view.rows*130 / 2);
+                layout.move (empty_cat_label, (view.columns - 2)*140/2, view.rows*130 / 2);
 
             } else {
     
                 if (view.apps[category].size == 0) {
-                    layout.move (empty_cat_label, (view.columns - 2)*130/2, view.rows*130 / 2);
+                    layout.move (empty_cat_label, (view.columns - 2)*140/2, view.rows*130 / 2);
                 } else {
-                    layout.move (empty_cat_label, view.columns*130, view.rows*130 / 2);
+                    layout.move (empty_cat_label, view.columns*140, view.rows*130 / 2);
                     foreach (App app in view.apps[category])
                         add_app (app);
                 }
@@ -210,10 +210,10 @@
 
             if (current_position < 0) {
                 int count = 0;
-                int val = columns*130*step / 10;
+                int val = columns*140*step / 10;
                 Timeout.add (20 / (step*step*2), () => {
 
-                    if (count >= columns*130*step) {
+                    if (count >= columns*140*step) {
                         count = 0;
                         return false;
                     }
@@ -237,12 +237,12 @@
             int columns = app_view.get_page_columns ();
             int pages = app_view.get_n_pages ();
 
-            if ((- current_position) < (columns*(pages - 1)*130)) {
+            if ((- current_position) < (columns*(pages - 1)*140)) {
                 int count = 0;
-                int val = columns*130*step / 10;
+                int val = columns*140*step / 10;
                 Timeout.add(20 / (2*step*step), () => {
                     
-                    if (count >= columns*130*step) {
+                    if (count >= columns*140*step) {
                         count = 0;
                         return false;
                     }

=== modified file 'src/Widgets/Grid.vala'
--- src/Widgets/Grid.vala	2011-10-10 14:10:37 +0000
+++ src/Widgets/Grid.vala	2012-02-26 20:43:17 +0000
@@ -40,7 +40,7 @@
             this.homogeneous = true;
 
             row_spacing = 20;
-            column_spacing = 0;
+            column_spacing = -10;
 
             page.rows = rows;
             page.columns = columns;