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

Merge branch 'cherry-pick-515f39f1' into 'gtk-4-10'

Browse Source 
Merge branch 'wip/otte/for-main' into 'main'

See merge request GNOME/gtk!5760
This commit is contained in:
Matthias Clasen
2023-04-01 12:48:49 +00:00
parent 520b25e96c 1be7a1f18f
commit 625219508b
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtklistbase.c
View File

@@ -639,6 +639,8 @@ gtk_list_base_set_adjustment (GtkListBase *self,
if (adjustment == NULL)
adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
else
gtk_adjustment_configure (adjustment, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
g_object_ref_sink (adjustment);
gtk_list_base_clear_adjustment (self, orientation);

3
gtk/gtkwidget.c
View File

@@ -5972,6 +5972,9 @@ gtk_widget_reposition_after (GtkWidget *widget,
prev_parent = priv->parent;
prev_previous = priv->prev_sibling;
if (priv->parent == parent && previous_sibling == prev_previous)
return;
if (priv->parent != NULL && priv->parent != parent)
{
g_warning ("Can't set new parent %s %p on widget %s %p, "