Merge lp:~artem-anufrij/granite/granite-modebutton-clear-selected into lp:~elementary-pantheon/granite/granite

[Artem Anufrij]

'selected = -1' clear selected items in ModeButton

all selected items will be unselected

[lp:~artem-anufrij/granite/granite-modebutton-clear-selected]

876. By Artem Anufrij on 2015-09-08

check if button is selected

[xapantu (xapantu)]

Could a foreach be used in clear_selected ()? It does not look very clean with the manual iteration (and it is slower, even if it is not noticeable on a modebutton with less than a thousand choices…).

review: Needs Fixing

[lp:~artem-anufrij/granite/granite-modebutton-clear-selected]

877. By Artem Anufrij on 2015-10-04

for -> foreach

Unmerged revisions

=== modified file 'demo/GraniteDemo.vala'
--- demo/GraniteDemo.vala	2015-08-30 10:10:29 +0000
+++ demo/GraniteDemo.vala	2015-10-04 10:41:06 +0000
@@ -220,10 +220,16 @@
         expandable_grid_start.expand = true;
         var expandable_grid_end = new Gtk.Grid ();
         expandable_grid_end.expand = true;
+        var clear_button = new Gtk.Button.with_label("Clear Selected");
+        clear_button.clicked.connect (() => {
+            icon_mode.selected = -1;
+            text_mode.selected = -1;
+        });
         grid.attach (expandable_grid_start, 0, 0, 1, 1);
-        grid.attach (expandable_grid_end, 2, 3, 1, 1);
+        grid.attach (expandable_grid_end, 2, 4, 1, 1);
         grid.attach (icon_mode, 1, 1, 1, 1);
         grid.attach (text_mode, 1, 2, 1, 1);
+        grid.attach (clear_button, 1, 3, 1 ,1);
         main_stack.add_named (grid, "modebutton");
     }
 
 
=== modified file 'lib/Widgets/ModeButton.vala'
--- lib/Widgets/ModeButton.vala	2015-08-23 16:13:24 +0000
+++ lib/Widgets/ModeButton.vala	2015-10-04 10:41:06 +0000
@@ -136,11 +136,26 @@
         }
 
         /**
+         * Clear selected items
+         */
+        private void clear_selected () {
+            foreach (var item in item_map.values) {
+                if (item != null && item.active)
+                    item.set_active (false);
+            }
+        }
+
+        /**
          * Sets item of given index's activity
          *
          * @param new_active_index index of changed item
          */
         public void set_active (int new_active_index) {
+            if (new_active_index == -1) {
+                clear_selected ();
+                return;
+            }
+
             return_if_fail (item_map.has_key (new_active_index));
             var new_item = item_map[new_active_index] as Item;