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

mouse: Move callbacks into .ui file

Browse source
This commit is contained in:
Robert Ancell 2018-05-30 09:12:11 +12:00
parent 4627e847af
commit 41d98fdf3f
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -309,11 +309,6 @@ setup_dialog (CcMouseProperties *self)
setup_touchpad_options (self); setup_touchpad_options (self);
g_signal_connect (self->edge_scrolling_switch, "state-set",
G_CALLBACK (edge_scrolling_changed_event), self);
g_signal_connect (self->two_finger_scrolling_switch, "state-set",
G_CALLBACK (two_finger_scrolling_changed_event), self);
gtk_list_box_set_header_func (GTK_LIST_BOX (self->touchpad_options_listbox), cc_list_box_update_header_func, NULL, NULL); gtk_list_box_set_header_func (GTK_LIST_BOX (self->touchpad_options_listbox), cc_list_box_update_header_func, NULL, NULL);
} }
@ -400,6 +395,10 @@ cc_mouse_properties_class_init (CcMousePropertiesClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, touchpad_toggle_switch); gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, touchpad_toggle_switch);
gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, two_finger_scrolling_row); gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, two_finger_scrolling_row);
gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, two_finger_scrolling_switch); gtk_widget_class_bind_template_child (widget_class, CcMouseProperties, two_finger_scrolling_switch);
gtk_widget_class_bind_template_callback (widget_class, edge_scrolling_changed_event);
gtk_widget_class_bind_template_callback (widget_class, two_finger_scrolling_changed_event);
gtk_widget_class_bind_template_callback (widget_class, on_content_size_changed);
} }
static void static void
@ -429,8 +428,6 @@ cc_mouse_properties_init (CcMouseProperties *self)
self->changing_scroll = FALSE; self->changing_scroll = FALSE;
setup_dialog (self); setup_dialog (self);
g_signal_connect (self->scrolled_window, "size-allocate", G_CALLBACK (on_content_size_changed), NULL);
} }
GtkWidget * GtkWidget *

3
panels/mouse/gnome-mouse-properties.ui
View file

@ -25,6 +25,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<property name="hscrollbar_policy">never</property> <property name="hscrollbar_policy">never</property>
<signal name="size-allocate" handler="on_content_size_changed"/>
<child> <child>
<object class="GtkBox" id="prefs_widget"> <object class="GtkBox" id="prefs_widget">
<property name="visible">True</property> <property name="visible">True</property>
@ -652,6 +653,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
<signal name="state-set" handler="two_finger_scrolling_changed_event"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -705,6 +707,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
<signal name="state-set" handler="edge_scrolling_changed_event"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>

10
panels/mouse/gnome-mouse-test.c
View file

@ -299,13 +299,6 @@ setup_dialog (CcMouseTest *self)
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GtkStyleProvider *provider; GtkStyleProvider *provider;
g_signal_connect (self->button_drawing_area, "button_press_event",
G_CALLBACK (button_drawing_area_button_press_event),
self);
g_signal_connect (self->button_drawing_area, "draw",
G_CALLBACK (button_drawing_area_draw_event),
self);
adjustment = GTK_ADJUSTMENT (self->scrolled_window_adjustment); adjustment = GTK_ADJUSTMENT (self->scrolled_window_adjustment);
gtk_adjustment_set_value (adjustment, gtk_adjustment_set_value (adjustment,
gtk_adjustment_get_upper (adjustment)); gtk_adjustment_get_upper (adjustment));
@ -361,6 +354,9 @@ cc_mouse_test_class_init (CcMouseTestClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcMouseTest, image); gtk_widget_class_bind_template_child (widget_class, CcMouseTest, image);
gtk_widget_class_bind_template_child (widget_class, CcMouseTest, scrolled_window_adjustment); gtk_widget_class_bind_template_child (widget_class, CcMouseTest, scrolled_window_adjustment);
gtk_widget_class_bind_template_child (widget_class, CcMouseTest, viewport); gtk_widget_class_bind_template_child (widget_class, CcMouseTest, viewport);
gtk_widget_class_bind_template_callback (widget_class, button_drawing_area_button_press_event);
gtk_widget_class_bind_template_callback (widget_class, button_drawing_area_draw_event);
} }
static void static void

2
panels/mouse/gnome-mouse-test.ui
View file

@ -76,6 +76,8 @@
<property name="margin_top">20</property> <property name="margin_top">20</property>
<property name="margin_bottom">20</property> <property name="margin_bottom">20</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<signal name="button_press_event" handler="button_drawing_area_button_press_event"/>
<signal name="draw" handler="button_drawing_area_draw_event"/>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>