diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-01-22 18:44:34 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-01-23 19:30:47 -0500 |
| commit | f3f5a896de2ce9bb7661ae70ce7cd69d19299994 (patch) | |
| tree | e39b26f47952d02203627caf8042ba8a87df177b /gtk/gtknotebook.c | |
| parent | 883d5d858405706d9a747acf9cc5f8c9f335ad4f (diff) | |
| download | gtk+-f3f5a896de2ce9bb7661ae70ce7cd69d19299994.tar.gz | |
box: Avoid position in the reorder api
Change the reorder api to insert after a sibling,
so that moving to first place becomes reorder (... NULL).
And add a insert_after api that can replace the common
container_add / reorder_after (... NULL) combination.
Update all callers.
Diffstat (limited to 'gtk/gtknotebook.c')
| -rw-r--r-- | gtk/gtknotebook.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index c3aa646546..8c52b52012 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -6204,7 +6204,7 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook) gtk_widget_set_hexpand (priv->header_widget, TRUE); gtk_widget_set_vexpand (priv->header_widget, FALSE); if (priv->show_tabs) - gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 0); + gtk_box_reorder_child_after (GTK_BOX (priv->box), priv->header_widget, NULL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_VERTICAL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_HORIZONTAL); @@ -6216,7 +6216,7 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook) gtk_widget_set_hexpand (priv->header_widget, TRUE); gtk_widget_set_vexpand (priv->header_widget, FALSE); if (priv->show_tabs) - gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 1); + gtk_box_reorder_child_after (GTK_BOX (priv->box), priv->header_widget, gtk_widget_get_last_child (priv->box)); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_VERTICAL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_HORIZONTAL); @@ -6228,7 +6228,7 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook) gtk_widget_set_hexpand (priv->header_widget, FALSE); gtk_widget_set_vexpand (priv->header_widget, TRUE); if (priv->show_tabs) - gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 0); + gtk_box_reorder_child_after (GTK_BOX (priv->box), priv->header_widget, NULL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_HORIZONTAL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_VERTICAL); @@ -6240,7 +6240,7 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook) gtk_widget_set_hexpand (priv->header_widget, FALSE); gtk_widget_set_vexpand (priv->header_widget, TRUE); if (priv->show_tabs) - gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 1); + gtk_box_reorder_child_after (GTK_BOX (priv->box), priv->header_widget, gtk_widget_get_last_child (priv->box)); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_HORIZONTAL); gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_VERTICAL); @@ -7147,10 +7147,11 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook, if (widget) { - int pos = pack_type == GTK_PACK_START ? 0 : -1; - gtk_container_add (GTK_CONTAINER (priv->header_widget), widget); - gtk_box_reorder_child (GTK_BOX (priv->header_widget), widget, pos); + if (pack_type == GTK_PACK_START) + gtk_box_reorder_child_after (GTK_BOX (priv->header_widget), widget, NULL); + else + gtk_box_reorder_child_after (GTK_BOX (priv->header_widget), widget, gtk_widget_get_last_child (priv->header_widget)); gtk_widget_set_child_visible (widget, priv->show_tabs); } |