Revert "combobox: Don't special-case RTL child positions anymore"

[~andy/gtk] / gtk / gtkbox.c

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 7d85ba0eea569481e185f97fd14716d45330fed4..efd4936657de106ba261596a49d8ef641cf1043c 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -79,12 +79,15 @@
 
 #include "gtkbox.h"
 #include "gtkboxprivate.h"
+#include "gtkintl.h"
 #include "gtkorientable.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
+#include "gtkorientableprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "a11y/gtkboxaccessible.h"
+#include "gtktypebuiltins.h"
+#include "gtksizerequest.h"
+#include "gtkwidgetpath.h"
+#include "gtkwidgetprivate.h"
+#include "a11y/gtkcontaineraccessible.h"
 
 
 enum {
@@ -148,8 +151,6 @@ static void gtk_box_size_allocate         (GtkWidget              *widget,
 static void gtk_box_compute_expand     (GtkWidget      *widget,
                                         gboolean       *hexpand,
                                         gboolean       *vexpand);
-static void gtk_box_direction_changed  (GtkWidget        *widget,
-                                        GtkTextDirection  previous_direction);
 
 static void gtk_box_set_property       (GObject        *object,
                                         guint           prop_id,
@@ -219,7 +220,6 @@ gtk_box_class_init (GtkBoxClass *class)
   widget_class->get_preferred_height_for_width = gtk_box_get_preferred_height_for_width;
   widget_class->get_preferred_width_for_height = gtk_box_get_preferred_width_for_height;
   widget_class->compute_expand                 = gtk_box_compute_expand;
-  widget_class->direction_changed              = gtk_box_direction_changed;
 
   container_class->add = gtk_box_add;
   container_class->remove = gtk_box_remove;
@@ -314,7 +314,7 @@ gtk_box_class_init (GtkBoxClass *class)
 
   g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
 
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BOX_ACCESSIBLE);
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
 }
 
 static void
@@ -352,6 +352,7 @@ gtk_box_set_property (GObject      *object,
     {
     case PROP_ORIENTATION:
       private->orientation = g_value_get_enum (value);
+      _gtk_orientable_set_style_classes (GTK_ORIENTABLE (box));
       gtk_widget_queue_resize (GTK_WIDGET (box));
       break;
     case PROP_SPACING:
@@ -854,9 +855,7 @@ count_widget_position (GtkWidget *widget,
 
   if (count->widget == widget)
     count->found = TRUE;
-  else if (count->found)
-    count->after++;
-  else
+  else if (!count->found)
     count->before++;
 }
 
@@ -878,11 +877,7 @@ gtk_box_get_visible_position (GtkBox    *box,
   if (!count.found)
     return -1;
 
-  if (box->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
-      gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
-    return count.after;
-  else
-    return count.before;
+  return count.before;
 }
 
 static GtkWidgetPath *
@@ -891,13 +886,11 @@ gtk_box_get_path_for_child (GtkContainer *container,
 {
   GtkWidgetPath *path, *sibling_path;
   GtkBox *box;
-  GtkBoxPrivate *private;
   GList *list, *children;
 
   box = GTK_BOX (container);
-  private = box->priv;
 
-  path = gtk_widget_path_copy (gtk_widget_get_path (GTK_WIDGET (container)));
+  path = _gtk_widget_create_path (GTK_WIDGET (container));
 
   if (gtk_widget_get_visible (child))
     {
@@ -907,9 +900,6 @@ gtk_box_get_path_for_child (GtkContainer *container,
 
       /* get_children works in visible order */
       children = gtk_container_get_children (container);
-      if (private->orientation == GTK_ORIENTATION_HORIZONTAL &&
-          gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
-        children = g_list_reverse (children);
 
       for (list = children; list; list = list->next)
         {
@@ -937,18 +927,17 @@ gtk_box_get_path_for_child (GtkContainer *container,
 }
 
 static void
-gtk_box_invalidate_order (GtkBox *box)
+gtk_box_invalidate_order_foreach (GtkWidget *widget)
 {
-  gtk_container_foreach (GTK_CONTAINER (box),
-                         (GtkCallback) gtk_widget_reset_style,
-                         NULL);
+  _gtk_widget_invalidate_style_context (widget, GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
 }
 
 static void
-gtk_box_direction_changed (GtkWidget        *widget,
-                           GtkTextDirection  previous_direction)
+gtk_box_invalidate_order (GtkBox *box)
 {
-  gtk_box_invalidate_order (GTK_BOX (widget));
+  gtk_container_foreach (GTK_CONTAINER (box),
+                         (GtkCallback) gtk_box_invalidate_order_foreach,
+                         NULL);
 }
 
 static void
@@ -1753,7 +1742,7 @@ gtk_box_set_child_packing (GtkBox      *box,
         pack_type = GTK_PACK_START;
       if (child_info->pack != pack_type)
         {
-         child_info->pack = GTK_PACK_END;
+         child_info->pack = pack_type;
           gtk_widget_child_notify (child, "pack-type");
           gtk_box_invalidate_order (box);
         }
@@ -1807,13 +1796,13 @@ gtk_box_remove (GtkContainer *container,
        {
          gboolean was_visible;
 
-         was_visible = gtk_widget_get_visible (widget);
-         gtk_widget_unparent (widget);
-
           g_signal_handlers_disconnect_by_func (widget,
                                                 box_child_visibility_notify_cb,
                                                 box);
 
+         was_visible = gtk_widget_get_visible (widget);
+         gtk_widget_unparent (widget);
+
          priv->children = g_list_remove_link (priv->children, children);
          g_list_free (children);
          g_free (child);