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

various fixes

See merge request GNOME/gtk!5756

(cherry picked from commit 515f39f161d73e4e58fcb58ed330db11c3bc8642)

6f417534 widget: Shortcut widget not repositioning
dbff49b5 listbase: Clear any newly set adjustments

diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index 8bc7271c26e0ec6cbfa5a16dd5966a7ec304dfaf..0e38bd42d13954bc307426d3514933763b71ee2e 100644 (file)
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -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);

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b933ac513d72b75a6a800072101634cc206404ca..3fdf21e3647918ed94b271fcbb1c6353bf2b2e0e 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -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, "