Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master See merge request GNOME/gtk!2240
This commit is contained in:
@@ -294,6 +294,7 @@ gtk_search_bar_class_init (GtkSearchBarClass *klass)
|
||||
object_class->get_property = gtk_search_bar_get_property;
|
||||
|
||||
widget_class->compute_expand = gtk_search_bar_compute_expand;
|
||||
widget_class->focus = gtk_widget_focus_child;
|
||||
|
||||
/**
|
||||
* GtkSearchBar:search-mode-enabled:
|
||||
|
||||
@@ -268,6 +268,7 @@ gtk_tree_expander_focus (GtkWidget *widget,
|
||||
return FALSE;
|
||||
|
||||
gtk_widget_grab_focus (widget);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -614,7 +615,7 @@ gtk_tree_expander_init (GtkTreeExpander *self)
|
||||
{
|
||||
GtkEventController *controller;
|
||||
|
||||
gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
|
||||
gtk_widget_set_focusable (GTK_WIDGET (self), TRUE);
|
||||
|
||||
controller = gtk_drop_controller_motion_new ();
|
||||
g_signal_connect (controller, "enter", G_CALLBACK (gtk_tree_expander_drag_enter), self);
|
||||
|
||||
Reference in New Issue
Block a user