applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mouse: Consolidate touchpad section visibility code

Browse source 
Do it all in a single place. No functional changes.

https://bugzilla.gnome.org/show_bug.cgi?id=764257
This commit is contained in:
Rui Matos 2016-04-04 19:59:16 +02:00
parent 727d2284f2
commit 0bc4b21bb2
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
panels/mouse/gnome-mouse-properties.c
View file

@ -79,6 +79,10 @@ setup_touchpad_options (CcMousePropertiesPrivate *d)
gboolean have_edge_scrolling; gboolean have_edge_scrolling;
gboolean have_tap_to_click; gboolean have_tap_to_click;
gtk_widget_set_visible (WID ("touchpad-frame"), d->have_touchpad);
if (!d->have_touchpad)
return;
cc_touchpad_check_capabilities (&have_two_finger_scrolling, &have_edge_scrolling, &have_tap_to_click); cc_touchpad_check_capabilities (&have_two_finger_scrolling, &have_edge_scrolling, &have_tap_to_click);
gtk_widget_show_all (WID ("touchpad-frame")); gtk_widget_show_all (WID ("touchpad-frame"));
@ -87,7 +91,9 @@ setup_touchpad_options (CcMousePropertiesPrivate *d)
gtk_widget_set_visible (WID ("tap-to-click-row"), have_tap_to_click); gtk_widget_set_visible (WID ("tap-to-click-row"), have_tap_to_click);
edge_scroll_enabled = g_settings_get_boolean (d->touchpad_settings, "edge-scrolling-enabled"); edge_scroll_enabled = g_settings_get_boolean (d->touchpad_settings, "edge-scrolling-enabled");
d->changing_scroll = TRUE;
gtk_switch_set_active (GTK_SWITCH (WID ("edge-scrolling-switch")), edge_scroll_enabled); gtk_switch_set_active (GTK_SWITCH (WID ("edge-scrolling-switch")), edge_scroll_enabled);
d->changing_scroll = FALSE;
} }
static void static void
@ -210,7 +216,6 @@ setup_dialog (CcMousePropertiesPrivate *d)
gtk_list_box_set_header_func (GTK_LIST_BOX (WID ("mouse-listbox")), cc_list_box_update_header_func, NULL, NULL); gtk_list_box_set_header_func (GTK_LIST_BOX (WID ("mouse-listbox")), cc_list_box_update_header_func, NULL, NULL);
/* Touchpad section */ /* Touchpad section */
gtk_widget_set_visible (WID ("touchpad-frame"), d->have_touchpad);
gtk_widget_set_visible (WID ("touchpad-toggle-switch"), gtk_widget_set_visible (WID ("touchpad-toggle-switch"),
show_touchpad_enabling_switch (d)); show_touchpad_enabling_switch (d));
@ -239,8 +244,7 @@ setup_dialog (CcMousePropertiesPrivate *d)
WID ("tap-to-click-switch"), "active", WID ("tap-to-click-switch"), "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
if (d->have_touchpad) setup_touchpad_options (d);
setup_touchpad_options (d);
g_signal_connect (WID ("edge-scrolling-switch"), "state-set", g_signal_connect (WID ("edge-scrolling-switch"), "state-set",
G_CALLBACK (edge_scrolling_changed_event), d); G_CALLBACK (edge_scrolling_changed_event), d);
@ -255,13 +259,8 @@ device_changed (GsdDeviceManager *device_manager,
CcMousePropertiesPrivate *d) CcMousePropertiesPrivate *d)
{ {
d->have_touchpad = touchpad_is_present (); d->have_touchpad = touchpad_is_present ();
gtk_widget_set_visible (WID ("touchpad-frame"), d->have_touchpad);
if (d->have_touchpad) { setup_touchpad_options (d);
d->changing_scroll = TRUE;
setup_touchpad_options (d);
d->changing_scroll = FALSE;
}
d->have_mouse = mouse_is_present (); d->have_mouse = mouse_is_present ();
gtk_widget_set_visible (WID ("mouse-frame"), d->have_mouse); gtk_widget_set_visible (WID ("mouse-frame"), d->have_mouse);