libegg r852 - in trunk: . libegg/toolpalette

[hasselmm svn gnome org]

Author: hasselmm
Date: Wed Jan 23 12:24:35 2008
New Revision: 852
URL: http://svn.gnome.org/viewvc/libegg?rev=852&view=rev

Log:
Fully expand tool items, when style != GTK_TOOLBAR_ICONS.

* libegg/toolpalette/eggtoolitemgroup.c: See above.


Modified:
   trunk/ChangeLog
   trunk/libegg/toolpalette/eggtoolitemgroup.c

Modified: trunk/libegg/toolpalette/eggtoolitemgroup.c
==============================================================================
--- trunk/libegg/toolpalette/eggtoolitemgroup.c	(original)
+++ trunk/libegg/toolpalette/eggtoolitemgroup.c	Wed Jan 23 12:24:35 2008
@@ -365,8 +365,8 @@
   GtkAllocation child_allocation;
   GtkRequisition item_size;
 
-  guint i, n_columns;
   gint width;
+  guint i;
 
   GtkOrientation orientation;
   GtkToolbarStyle style;
@@ -379,8 +379,14 @@
   egg_tool_item_group_get_item_size (group, &item_size);
 
   item_size.width = MIN (item_size.width, allocation->width);
-  n_columns = MAX (allocation->width / item_size.width, 1);
-  width = item_size.width * n_columns;
+
+  if (style == GTK_TOOLBAR_ICONS)
+    {
+      guint n_columns = MAX (allocation->width / item_size.width, 1);
+      width = item_size.width * n_columns;
+    }
+  else
+    width = allocation->width;
 
   child_allocation.x = border_width;
   child_allocation.y = border_width;