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

various fixes

See merge request GNOME/gtk!5756

(cherry picked from commit 515f39f161)

6f417534 widget: Shortcut widget not repositioning
dbff49b5 listbase: Clear any newly set adjustments
This commit is contained in:
Benjamin Otte
2023-03-31 15:58:03 +00:00
parent 3458ebf8c9
commit 1be7a1f18f
2 changed files with 5 additions and 0 deletions

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);

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, "