toolbar: Stop reordering css nodes based on text direction
authorTimm Bäder <mail@baedert.org>
Sat, 16 Jun 2018 14:09:14 +0000 (16:09 +0200)
committerTimm Bäder <mail@baedert.org>
Mon, 18 Jun 2018 15:35:02 +0000 (17:35 +0200)
gtk/gtktoolbar.c

index ccb6f405d1c61725df5384b26dc52d3a5fb3b020..f49a7708731b1cb3b85b49170ae1e837c242a9be 100644 (file)
@@ -221,8 +221,6 @@ static void       gtk_toolbar_forall               (GtkContainer        *contain
                                                    gpointer             callback_data);
 static GType      gtk_toolbar_child_type           (GtkContainer        *container);
 
-static void       gtk_toolbar_direction_changed    (GtkWidget           *widget,
-                                                    GtkTextDirection     previous_direction);
 static void       gtk_toolbar_orientation_changed  (GtkToolbar          *toolbar,
                                                    GtkOrientation       orientation);
 static void       gtk_toolbar_real_style_changed   (GtkToolbar          *toolbar,
@@ -387,8 +385,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
 
   widget_class->display_changed = gtk_toolbar_display_changed;
   widget_class->popup_menu = gtk_toolbar_popup_menu;
-  widget_class->direction_changed = gtk_toolbar_direction_changed;
-  
+
   container_class->add    = gtk_toolbar_add;
   container_class->remove = gtk_toolbar_remove;
   container_class->forall = gtk_toolbar_forall;
@@ -2712,16 +2709,8 @@ toolbar_content_new_tool_item (GtkToolbar  *toolbar,
   previous = pos > 0 ? g_list_nth_data (priv->content, -1) : NULL;
   priv->content = g_list_insert (priv->content, content, pos);
 
-  if (gtk_widget_get_direction (GTK_WIDGET (toolbar)) == GTK_TEXT_DIR_RTL)
-    gtk_css_node_insert_after (gtk_widget_get_css_node (GTK_WIDGET (toolbar)),
-                               gtk_widget_get_css_node (GTK_WIDGET (item)),
-                               previous ? gtk_widget_get_css_node (GTK_WIDGET (previous->item)) : NULL);
-  else
-    gtk_css_node_insert_before (gtk_widget_get_css_node (GTK_WIDGET (toolbar)),
-                                gtk_widget_get_css_node (GTK_WIDGET (item)),
-                                previous ? gtk_widget_get_css_node (GTK_WIDGET (previous->item)) : NULL);
-
-  gtk_widget_set_parent (GTK_WIDGET (item), GTK_WIDGET (toolbar));
+  gtk_widget_insert_after (GTK_WIDGET (item), GTK_WIDGET (toolbar),
+                           previous ? GTK_WIDGET (previous->item) : NULL);
 
   if (!is_placeholder)
     {
@@ -3114,13 +3103,3 @@ toolbar_rebuild_menu (GtkToolShell *shell)
   
   gtk_widget_queue_resize (GTK_WIDGET (shell));
 }
-
-static void
-gtk_toolbar_direction_changed (GtkWidget        *widget,
-                               GtkTextDirection  previous_direction)
-{
-  GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->direction_changed (widget, previous_direction);
-
-  gtk_css_node_reverse_children (gtk_widget_get_css_node (widget));
-}
-