[gtk/wip/baedert/box2: 7/21] scalebutton: Stop relying on GtkBox's pack-type child prop



commit d2c35b34506d38a86c600b6a16324e58d8d50c10
Author: Timm Bäder <mail baedert org>
Date:   Wed Dec 26 08:26:41 2018 +0100

    scalebutton: Stop relying on GtkBox's pack-type child prop

 gtk/gtkscalebutton.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 116ccef306..9102b333c1 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -724,18 +724,20 @@ apply_orientation (GtkScaleButton *button,
     {
       priv->applied_orientation = orientation;
       gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), orientation);
-      gtk_container_child_set (GTK_CONTAINER (priv->box),
-                               priv->plus_button,
-                               "pack-type",
-                               orientation == GTK_ORIENTATION_VERTICAL ?
-                               GTK_PACK_START : GTK_PACK_END,
-                               NULL);
-      gtk_container_child_set (GTK_CONTAINER (priv->box),
-                               priv->minus_button,
-                               "pack-type",
-                               orientation == GTK_ORIENTATION_VERTICAL ?
-                               GTK_PACK_END : GTK_PACK_START,
-                               NULL);
+
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        {
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->scale, 0);
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->minus_button, 1);
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->plus_button, 2);
+        }
+      else
+        {
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->scale, 1);
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->minus_button, 2);
+          gtk_box_reorder_child (GTK_BOX (priv->box), priv->plus_button, 0);
+
+        }
 
       gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale), orientation);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]