Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dropdown-inertness' into 'main'

Browse Source 
dropdown: Fix to work with recent listview changes

See merge request GNOME/gtk!5773
This commit is contained in:
Benjamin Otte
2023-04-02 16:59:10 +00:00
parent d6a27a41c2 1068808742
commit 461e562ec9
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkdropdown.c
View File

@@ -482,6 +482,27 @@ gtk_drop_down_grab_focus (GtkWidget *widget)
return gtk_widget_grab_focus (self->button);
}
static void
gtk_drop_down_root (GtkWidget *widget)
{
GtkDropDown *self = GTK_DROP_DOWN (widget);
GTK_WIDGET_CLASS (gtk_drop_down_parent_class)->root (widget);
if (self->factory)
gtk_list_factory_widget_set_factory (GTK_LIST_FACTORY_WIDGET (self->button_item), self->factory);
}
static void
gtk_drop_down_unroot (GtkWidget *widget)
{
GtkDropDown *self = GTK_DROP_DOWN (widget);
if (self->factory)
gtk_list_factory_widget_set_factory (GTK_LIST_FACTORY_WIDGET (self->button_item), NULL);
GTK_WIDGET_CLASS (gtk_drop_down_parent_class)->unroot (widget);
}
static void
gtk_drop_down_class_init (GtkDropDownClass *klass)
@@ -497,6 +518,8 @@ gtk_drop_down_class_init (GtkDropDownClass *klass)
widget_class->size_allocate = gtk_drop_down_size_allocate;
widget_class->focus = gtk_drop_down_focus;
widget_class->grab_focus = gtk_drop_down_grab_focus;
widget_class->root = gtk_drop_down_root;
widget_class->unroot = gtk_drop_down_unroot;
/**
* GtkDropDown:factory: (attributes org.gtk.Property.get=gtk_drop_down_get_factory org.gtk.Property.set=gtk_drop_down_set_factory)
@@ -915,7 +938,9 @@ gtk_drop_down_set_factory (GtkDropDown *self,
if (!g_set_object (&self->factory, factory))
return;
gtk_list_factory_widget_set_factory (GTK_LIST_FACTORY_WIDGET (self->button_item), factory);
if (gtk_widget_get_root (GTK_WIDGET (self)))
gtk_list_factory_widget_set_factory (GTK_LIST_FACTORY_WIDGET (self->button_item), factory);
if (self->list_factory == NULL)
gtk_list_view_set_factory (GTK_LIST_VIEW (self->popup_list), factory);