diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-04-01 12:48:49 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-01 12:48:49 +0000 |
| commit | 625219508b20f9f55c7a34d2420cf642f6370e3e (patch) | |
| tree | a0265f78b4c7a6a1e64db903d078238b9632a545 | |
| parent | 520b25e96c0ac1bf94423344c15f2a22db1afc94 (diff) | |
| parent | 1be7a1f18f69bbbe87cb528a4e4c84a1e7f25d91 (diff) | |
| download | gtk+-625219508b20f9f55c7a34d2420cf642f6370e3e.tar.gz | |
Merge branch 'cherry-pick-515f39f1' into 'gtk-4-10'
Merge branch 'wip/otte/for-main' into 'main'
See merge request GNOME/gtk!5760
| -rw-r--r-- | gtk/gtklistbase.c | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c index 8bc7271c26..0e38bd42d1 100644 --- 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 adc18da4f0..123bf17745 100644 --- 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, " |