Merge lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/natural-scroll-mouse into lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/trunk

[Danielle Foré]

Add natural scrolling setting for mouse

This toggles the setting, but someone with a mouse should confirm that it actually works

[Corentin Noël (tintou)]

For mouses it's not "Natural" it's reversed

review: Needs Information

[lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/natural-scroll-mouse]

76. By Danielle Foré on 2016-07-19

merge trunk

[Danielle Foré (danrabbit)]

i don't think it makes sense to have two different labels for a switch that effectively does the same thing.

=== modified file 'src/Widgets/MouseSection.vala'
--- src/Widgets/MouseSection.vala	2016-07-19 10:20:45 +0000
+++ src/Widgets/MouseSection.vala	2016-07-19 10:25:35 +0000
@@ -21,6 +21,7 @@
     private Backend.MouseSettings mouse_settings;
 
     private Gtk.Scale pointer_speed_scale;
+    private Gtk.Switch natural_scrolling_switch;
 
     public MouseSection (Backend.MouseSettings mouse_settings) {
         base (_("Mouse"));
@@ -37,8 +38,11 @@
         pointer_speed_scale.digits = 2;
         pointer_speed_scale.draw_value = false;
         pointer_speed_scale.set_size_request (160, -1);
+        natural_scrolling_switch = new Gtk.Switch ();
+        natural_scrolling_switch.halign = Gtk.Align.START;
 
         this.add_entry (_("Pointer speed:"), pointer_speed_scale);
+        this.add_entry (_("Natural scrolling:"), natural_scrolling_switch);
     }
 
     private void create_bindings () {
@@ -47,6 +51,11 @@
                                                       "speed",
                                                       BindingFlags.SYNC_CREATE,
                                                       pointer_speed_scale_transform_func);
+
+        mouse_settings.bind_property ("natural-scroll",
+                                      natural_scrolling_switch,
+                                      "state",
+                                      BindingFlags.BIDIRECTIONAL | BindingFlags.SYNC_CREATE);
     }
 
     private bool pointer_speed_scale_transform_func (Binding binding, Value source_value, ref Value target_value) {