Merge lp:~donadigo/switchboard-plug-mouse-touchpad/mouse-hide-section into lp:~elementary-pantheon/switchboard-plug-mouse-touchpad/trunk

[Adam Bieńkowski]

Fix bug #1487959 "Don't show "Mouse" header if no mouse".

Fix bug #1487959 "Don't show "Mouse" header if no mouse".

If there is no mouse type of device present, hide mouse section.

[lp:~donadigo/switchboard-plug-mouse-touchpad/mouse-hide-section]

43. By Adam Bieńkowski on 2016-02-19

Remove comment

[Danielle Foré (danrabbit)]

Hm I can't confirm that this hides the mouse section. Anything I can do to help debug?

[lp:~donadigo/switchboard-plug-mouse-touchpad/mouse-hide-section]

44. By Adam Bieńkowski on 2016-02-19

MASTER to SLAVES

45. By Adam Bieńkowski on 2016-02-19

Add debug

46. By Adam Bieńkowski on 2016-02-19

Name info

47. By Adam Bieńkowski on 2016-02-19

Ignore virtual devices

=== modified file 'src/mouse-touchpad.vala'
--- src/mouse-touchpad.vala	2015-12-20 03:34:56 +0000
+++ src/mouse-touchpad.vala	2016-02-19 20:56:16 +0000
@@ -76,11 +76,45 @@
             mouse_section = new Widgets.MouseSection (mouse_settings);
             touchpad_section = new Widgets.TouchpadSection (touchpad_settings);
 
+            var display = Gdk.Display.get_default ();
+            if (display != null) {
+                var manager = Gdk.Display.get_default ().get_device_manager ();
+                manager.device_added.connect (() => {
+                    update_ui (manager);
+                });
+
+                manager.device_removed.connect (() => {
+                    update_ui (manager);
+                });
+
+                update_ui (manager);    
+            }
+
             main_grid.attach (general_section, 0, 0, 1, 1);
             main_grid.attach (mouse_section, 0, 1, 1, 1);
             main_grid.attach (touchpad_section, 0, 2, 1, 1);
             main_grid.show_all ();
         }
+
+        private void update_ui (Gdk.DeviceManager manager) {
+            if (has_mouse (manager)) {
+                mouse_section.no_show_all = false;
+                mouse_section.show_all ();
+            } else {
+                mouse_section.no_show_all = true;
+                mouse_section.hide ();        
+            }
+        }
+
+        private bool has_mouse (Gdk.DeviceManager manager) {
+            foreach (var device in manager.list_devices (Gdk.DeviceType.SLAVE)) {
+                if (device.get_source () == Gdk.InputSource.MOUSE && !device.get_name ().has_prefix ("Virtual core")) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }