Merge lp:~voluntatefaber/slingshot/resolution-adjustments into lp:~elementary-pantheon/slingshot/trunk

[Andrea Basso]

[Cody Garver (codygarver)]

I have not been able to compile Granite lately so I asked Tom to take a look at this branch. I approve that he approves.

review: Approve

=== modified file 'org.pantheon.desktop.slingshot.gschema.xml'
--- org.pantheon.desktop.slingshot.gschema.xml	2012-07-13 11:57:20 +0000
+++ org.pantheon.desktop.slingshot.gschema.xml	2012-08-18 23:21:21 +0000
@@ -3,12 +3,12 @@
         <key name="columns" type="i">
             <default>5</default>
             <summary>The default number of columns</summary>
-            <description>This value needs to be greater than 5 to be effective.</description>
+            <description>This value needs to be greater than 3 to be effective.</description>
         </key>
         <key name="rows" type="i">
             <default>3</default>
             <summary>The default number of rows</summary>
-            <description>This value needs to be greater than 3 to be effective.</description>
+            <description>This value needs to be greater than 1 to be effective.</description>
         </key>
         <key name="icon-size" type="i">
             <default>64</default>

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-08-17 21:51:24 +0000
+++ src/SlingshotView.vala	2012-08-18 23:21:21 +0000
@@ -119,6 +119,8 @@
         
             debug ("In setup_size ()");
             Slingshot.settings.screen_resolution = @"$(screen.get_width ())x$(screen.get_height ())";
+            default_columns = 5;
+            default_rows = 3;
             while ((default_columns*130 +48 >= 2*screen.get_width ()/3)) {
                 default_columns--;
             }
@@ -126,8 +128,10 @@
             while ((default_rows*145 + 72 >= 2*screen.get_height ()/3)) {
                 default_rows--;
             }
-            if (Slingshot.settings.columns != default_columns)
+            
+            if (Slingshot.settings.columns != default_columns) {
                 Slingshot.settings.columns = default_columns;
+            }
             if (Slingshot.settings.rows != default_rows)
                 Slingshot.settings.rows = default_rows;
         }
@@ -257,7 +261,8 @@
             });
 
             // Auto-update settings when changed
-            //Slingshot.settings.changed.connect (() => read_settings ());
+            Slingshot.settings.changed["rows"].connect ( () => {read_settings (false, false, true);});
+            Slingshot.settings.changed["columns"].connect ( () => {read_settings (false, true, false);});
 
             // Auto-update applications grid
             app_system.changed.connect (() => {
@@ -271,6 +276,7 @@
 
             // position on the right monitor when settings changed
             screen.size_changed.connect (() => {
+                setup_size ();
                 reposition ();
             });
             screen.monitors_changed.connect (() => {
@@ -768,17 +774,31 @@
 
         }
 
-        private void read_settings (bool first_start = false) {
-
-            if (Slingshot.settings.columns > 3)
-                default_columns = Slingshot.settings.columns;
-            else
-                default_columns = Slingshot.settings.columns = 5;
-
-            if (Slingshot.settings.rows > 1)
-                default_rows = Slingshot.settings.rows;
-            else
-                default_rows = Slingshot.settings.rows = 3;
+        private void read_settings (bool first_start = false, bool check_columns = true, bool check_rows = true) {
+
+            if (check_columns) {
+                if (Slingshot.settings.columns > 3)
+                    default_columns = Slingshot.settings.columns;
+                else
+                    default_columns = Slingshot.settings.columns = 4;
+            }
+            
+            if (check_rows) {
+                if (Slingshot.settings.rows > 1)
+                    default_rows = Slingshot.settings.rows;
+                else
+                    default_rows = Slingshot.settings.rows = 2;
+            }
+                
+            if (!first_start) {
+                grid_view.resize (default_rows, default_columns);
+                populate_grid_view ();
+                height_request = default_rows * 145 + 180;
+                
+                category_view.app_view.resize (default_rows, default_columns);
+                category_view.set_size_request (columns*130 + 17, view_height);
+                category_view.show_filtered_apps (category_view.category_ids.get (category_view.category_switcher.selected));
+            }
 
         }
         

=== modified file 'src/Widgets/CategoryView.vala'
--- src/Widgets/CategoryView.vala	2012-08-17 21:23:25 +0000
+++ src/Widgets/CategoryView.vala	2012-08-18 23:21:21 +0000
@@ -41,7 +41,7 @@
         private int current_position = 0;
         private bool from_category = false;
         
-        private HashMap<int, string> category_ids = new HashMap<int, string> ();
+        public HashMap<int, string> category_ids = new HashMap<int, string> ();
         
         public CategoryView (SlingshotView parent) {
 
@@ -227,7 +227,7 @@
 
         }
 
-        private void show_filtered_apps (string category) {
+        public void show_filtered_apps (string category) {
 
             switcher.clear_children ();
             app_view.clear ();

=== modified file 'src/Widgets/Grid.vala'
--- src/Widgets/Grid.vala	2012-06-20 22:54:03 +0000
+++ src/Widgets/Grid.vala	2012-08-18 23:21:21 +0000
@@ -121,6 +121,15 @@
             }
 
         }
+        
+        public void resize (int rows, int columns) {
+
+            clear ();
+            page.rows = rows;
+            page.columns = columns;
+            page.number = 1;
+
+        }
 
     }