This is an implementation of Idea #13 from

        http://www.jcinteractive.com/gnome-ui/software/widgets/
basically, layouting the toolbar icon and label horizontally.

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index f318fd1ab4d1429516564dff84f2212825db0bb1..d004d728b033e1832b7bd60f593469d01f706441 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -270,7 +270,8 @@ typedef enum
 {
   GTK_TOOLBAR_ICONS,
   GTK_TOOLBAR_TEXT,
-  GTK_TOOLBAR_BOTH
+  GTK_TOOLBAR_BOTH,
+  GTK_TOOLBAR_BOTH_HORIZ
 } GtkToolbarStyle;
 
 /* Trough types for GtkRange */

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e136bd70b797af297c5c8cf5ca5b85395bcee26c..cb726aa67c092f650fe653de4e849e192b2488ac 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -30,6 +30,7 @@
 #include "gtkradiobutton.h"
 #include "gtklabel.h"
 #include "gtkvbox.h"
+#include "gtkhbox.h"
 #include "gtktoolbar.h"
 
 
@@ -819,7 +820,7 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
                            gint                 position)
 {
   GtkToolbarChild *child;
-  GtkWidget *vbox;
+  GtkWidget *box;
 
   g_return_val_if_fail (toolbar != NULL, NULL);
   g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
@@ -882,14 +883,17 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
        gtk_signal_connect (GTK_OBJECT (child->widget), "clicked",
                            callback, user_data);
 
-      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (child->widget), vbox);
-      gtk_widget_show (vbox);
+      if (toolbar->style == GTK_TOOLBAR_BOTH_HORIZ)
+         box = gtk_hbox_new (FALSE, 0);
+      else
+         box = gtk_vbox_new (FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (child->widget), box);
+      gtk_widget_show (box);
 
       if (text)
        {
          child->label = gtk_label_new (text);
-         gtk_box_pack_end (GTK_BOX (vbox), child->label, FALSE, FALSE, 0);
+         gtk_box_pack_end (GTK_BOX (box), child->label, FALSE, FALSE, 0);
          if (toolbar->style != GTK_TOOLBAR_ICONS)
            gtk_widget_show (child->label);
        }
@@ -897,7 +901,7 @@ gtk_toolbar_insert_element (GtkToolbar          *toolbar,
       if (icon)
        {
          child->icon = GTK_WIDGET (icon);
-         gtk_box_pack_end (GTK_BOX (vbox), child->icon, FALSE, FALSE, 0);
+         gtk_box_pack_end (GTK_BOX (box), child->icon, FALSE, FALSE, 0);
          if (toolbar->style != GTK_TOOLBAR_TEXT)
            gtk_widget_show (child->icon);
        }
@@ -1055,6 +1059,7 @@ gtk_real_toolbar_style_changed (GtkToolbar      *toolbar,
 {
   GList *children;
   GtkToolbarChild *child;
+  GtkWidget* box = NULL;
 
   g_return_if_fail (toolbar != NULL);
   g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
@@ -1084,7 +1089,7 @@ gtk_real_toolbar_style_changed (GtkToolbar      *toolbar,
              case GTK_TOOLBAR_TEXT:
                if (child->icon && GTK_WIDGET_VISIBLE (child->icon))
                  gtk_widget_hide (child->icon);
-
+               
                if (child->label && !GTK_WIDGET_VISIBLE (child->label))
                  gtk_widget_show (child->label);
 
@@ -1097,6 +1102,86 @@ gtk_real_toolbar_style_changed (GtkToolbar      *toolbar,
                if (child->label && !GTK_WIDGET_VISIBLE (child->label))
                  gtk_widget_show (child->label);
 
+               box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data;
+
+               if (GTK_IS_HBOX (box))
+               {
+                   if (child->icon)
+                   {
+                       gtk_object_ref (GTK_OBJECT (child->icon));
+                       gtk_container_remove (GTK_CONTAINER (box),
+                                             child->icon);
+                   }
+                   if (child->label)
+                   {
+                       gtk_object_ref (GTK_OBJECT (child->label));
+                       gtk_container_remove (GTK_CONTAINER (box),
+                                             child->label);
+                   }
+                   gtk_container_remove (GTK_CONTAINER (child->widget),
+                                         box);
+                   
+                   box = gtk_vbox_new (FALSE, 0);
+                   gtk_widget_show (box);
+                   
+                   if (child->label)
+                   {
+                       gtk_box_pack_end (GTK_BOX (box), child->label, FALSE, FALSE, 0);
+                       gtk_object_unref (GTK_OBJECT (child->label));
+                   }
+                   if (child->icon)
+                   {
+                       gtk_box_pack_end (GTK_BOX (box), child->icon, FALSE, FALSE, 0);
+                       gtk_object_unref (GTK_OBJECT (child->icon));
+                   }
+                   gtk_container_add (GTK_CONTAINER (child->widget),
+                                      box);
+               }
+               
+               break;
+               
+             case GTK_TOOLBAR_BOTH_HORIZ:
+               if (child->icon && !GTK_WIDGET_VISIBLE (child->icon))
+                 gtk_widget_show (child->icon);
+               if (child->label && !GTK_WIDGET_VISIBLE (child->label))
+                 gtk_widget_show (child->label);
+
+               box = (GtkWidget*)gtk_container_children (GTK_CONTAINER (child->widget))->data;
+               
+               if (GTK_IS_VBOX (box))
+               {
+                   if (child->icon)
+                   {
+                       gtk_object_ref (GTK_OBJECT (child->icon));
+                       gtk_container_remove (GTK_CONTAINER (box),
+                                             child->icon);
+                   }
+                   if (child->label)
+                   {
+                       gtk_object_ref (GTK_OBJECT (child->label));
+                       gtk_container_remove (GTK_CONTAINER (box),
+                                             child->label);
+                   }
+                   gtk_container_remove (GTK_CONTAINER (child->widget),
+                                         box);
+
+                   box = gtk_hbox_new (FALSE, 0);
+                   gtk_widget_show (box);
+                   
+                   if (child->label)
+                   {
+                       gtk_box_pack_end (GTK_BOX (box), child->label, TRUE, TRUE, 0);
+                       gtk_object_unref (GTK_OBJECT (child->label));
+                   }
+                   if (child->icon)
+                   {
+                       gtk_box_pack_end (GTK_BOX (box), child->icon, FALSE, FALSE, 0);
+                       gtk_object_unref (GTK_OBJECT (child->icon));
+                   }
+                   gtk_container_add (GTK_CONTAINER (child->widget), box);
+                   
+               }
+               
                break;
 
              default:

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 47a967f26bf8ed646a69bc64bbd467eb230b51e3..a2b6a78dea9c8649986ae55b4d3015e696ab68d0 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -623,6 +623,13 @@ set_toolbar_both (GtkWidget *widget,
   gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH);
 }
 
+static void
+set_toolbar_both_horiz (GtkWidget *widget,
+                       gpointer   data)
+{
+  gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH_HORIZ);
+}
+
 static void
 set_toolbar_small_space (GtkWidget *widget,
                         gpointer   data)
@@ -725,7 +732,13 @@ create_toolbar (void)
                               "Both", "Show toolbar icons and text", "Toolbar/Both",
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
                               (GtkSignalFunc) set_toolbar_both, toolbar);
-
+      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
+                              "Both (horizontal)",
+                              "Show toolbar icons and text in a horizontal fashion",
+                              "Toolbar/BothHoriz",
+                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
+                              (GtkSignalFunc) set_toolbar_both_horiz, toolbar);
+                              
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
       entry = gtk_entry_new ();

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 47a967f26bf8ed646a69bc64bbd467eb230b51e3..a2b6a78dea9c8649986ae55b4d3015e696ab68d0 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -623,6 +623,13 @@ set_toolbar_both (GtkWidget *widget,
   gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH);
 }
 
+static void
+set_toolbar_both_horiz (GtkWidget *widget,
+                       gpointer   data)
+{
+  gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH_HORIZ);
+}
+
 static void
 set_toolbar_small_space (GtkWidget *widget,
                         gpointer   data)
@@ -725,7 +732,13 @@ create_toolbar (void)
                               "Both", "Show toolbar icons and text", "Toolbar/Both",
                               new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
                               (GtkSignalFunc) set_toolbar_both, toolbar);
-
+      gtk_toolbar_append_item (GTK_TOOLBAR (toolbar),
+                              "Both (horizontal)",
+                              "Show toolbar icons and text in a horizontal fashion",
+                              "Toolbar/BothHoriz",
+                              new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]),
+                              (GtkSignalFunc) set_toolbar_both_horiz, toolbar);
+                              
       gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
       entry = gtk_entry_new ();