Commit 47aab3c2 authored by Arnaud B.'s avatar Arnaud B.

Always allow touchpad if no other pointer device.

It was possible to completely disable
touchpad even when there was no other
pointer device. And worse, this panel
being no keyboard-browsable, the only
practical solution was then to find a
mouse and connect it to the computer.

Closes #429.
parent e85816f8
Pipeline #71030 passed with stages
in 3 minutes and 28 seconds
......@@ -213,7 +213,7 @@ touchpad_enabled_set_mapping (const GValue *value,
enabled = g_value_get_boolean (value);
return g_variant_new_string (enabled ? "enabled" : "disabled");
return g_variant_new_string (enabled ? "enabled" : "disabled-on-external-mouse");
}
static void
......@@ -280,36 +280,6 @@ setup_dialog (CcMouseProperties *self)
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
self->touchpad_natural_scrolling_row, "sensitive",
G_SETTINGS_BIND_GET,
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
self->touchpad_speed_row, "sensitive",
G_SETTINGS_BIND_GET,
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
self->tap_to_click_row, "sensitive",
G_SETTINGS_BIND_GET,
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
self->two_finger_scrolling_row, "sensitive",
G_SETTINGS_BIND_GET,
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind_with_mapping (self->touchpad_settings, "send-events",
self->edge_scrolling_row, "sensitive",
G_SETTINGS_BIND_GET,
touchpad_enabled_get_mapping,
touchpad_enabled_set_mapping,
NULL, NULL);
g_settings_bind (self->touchpad_settings, "natural-scroll",
self->touchpad_natural_scrolling_switch, "active",
......
......@@ -388,7 +388,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="valign">end</property>
<property name="label" translatable="yes">Touchpad</property>
<property name="label" translatable="yes">Allow touchpad with mouse</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">touchpad_toggle_switch</property>
</object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment