Merge lp:~diegoprovinciani/switchboard-plug-mouse-touchpad/1487958 into lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/trunk

[Diego Provinciani]

Horizontal and natural scrolling options insensitive when scrolling is disabled

Added a connection to the emitted signal when the scrolling_combobox change.
When the signal is emitted, is checked the scrolling_combobox active id, if it is "disabled", the horizontal and natural scrolling switches will be disabled. Otherwise will be enabled.

[Felipe Escoto (philip.scott)]

Nice change :) I'm for it! Just a nitpick, the if-else braces should be on the same line like
} else {

review: Needs Fixing

[lp:~diegoprovinciani/switchboard-plug-mouse-touchpad/1487958]

120. By Diego Provinciani on 2016-11-15

Horizontal and natural scrolling options insensitive when scrolling is disabled

[Diego Provinciani (diegoprovinciani)]

> Nice change :) I'm for it! Just a nitpick, the if-else braces should be on the
> same line like
> } else {

Done

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'src/Widgets/TouchpadSection.vala'
--- src/Widgets/TouchpadSection.vala	2016-10-24 19:14:48 +0000
+++ src/Widgets/TouchpadSection.vala	2016-11-15 22:40:01 +0000
@@ -101,6 +101,17 @@
                 touchpad_settings.click_method = "none";
             }
         });
+        
+        scrolling_combobox.changed.connect (() => {
+            string active_text = scrolling_combobox.get_active_id ();
+            if (active_text == "disabled") {
+                horizontal_scrolling_switch.sensitive = false;
+                natural_scrolling_switch.sensitive = false;
+            } else {
+                horizontal_scrolling_switch.sensitive = true;
+                natural_scrolling_switch.sensitive = true;
+            }
+        });
 
         touchpad_settings.bind_property ("scroll-method",
                                          scrolling_combobox,