diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2004-02-26 22:29:24 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-02-26 22:29:24 +0000 |
| commit | dc0718bd7e95bb93e1c1c0fe715d3827e79a6080 (patch) | |
| tree | 4d6752cf63fc177832ccba2d19f66424785fb002 /gtk/gtkmenubar.c | |
| parent | 211b6450571da88fe776f2dc0b8ae29f71e1af67 (diff) | |
| download | gtk+-dc0718bd7e95bb93e1c1c0fe715d3827e79a6080.tar.gz | |
New function. Use resize cursors for resize grips. (Bug #129621)
Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
cursors for resize grips. (Bug #129621)
* gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
fix - patch by Torsten Schoenfeld.
* gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
space between the items. (Bug #110775)
* gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
inside menu items that are inside a menu bar. (Bug #110775)
* configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
not GDK_PACKAGES, to prevent applications from getting linked to
it (Bug #119804)
* gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
ipadding inside the item. (Bug #61843)
Diffstat (limited to 'gtk/gtkmenubar.c')
| -rw-r--r-- | gtk/gtkmenubar.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 2842d201cb..31581ea9ae 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -38,7 +38,6 @@ #define BORDER_SPACING 0 -#define CHILD_SPACING 3 #define DEFAULT_IPADDING 1 static void gtk_menu_bar_class_init (GtkMenuBarClass *klass); @@ -227,13 +226,6 @@ gtk_menu_bar_size_request (GtkWidget *widget, requisition->width += toggle_size; requisition->height = MAX (requisition->height, child_requisition.height); - /* Support for the right justified help menu */ - if ((children == NULL) && GTK_IS_MENU_ITEM(child) && - GTK_MENU_ITEM(child)->right_justify) - { - requisition->width += CHILD_SPACING; - } - nchildren += 1; } } @@ -252,9 +244,6 @@ gtk_menu_bar_size_request (GtkWidget *widget, requisition->width += widget->style->xthickness * 2; requisition->height += widget->style->ythickness * 2; } - - if (nchildren > 0) - requisition->width += 2 * CHILD_SPACING * (nchildren - 1); } } @@ -269,9 +258,9 @@ gtk_menu_bar_size_allocate (GtkWidget *widget, GtkAllocation child_allocation; GtkRequisition child_requisition; guint offset; - gint ipadding; GtkTextDirection direction; gint ltr_x; + gint ipadding; g_return_if_fail (GTK_IS_MENU_BAR (widget)); g_return_if_fail (allocation != NULL); @@ -292,10 +281,9 @@ gtk_menu_bar_size_allocate (GtkWidget *widget, if (menu_shell->children) { child_allocation.x = (GTK_CONTAINER (menu_bar)->border_width + - ipadding + + ipadding + BORDER_SPACING); child_allocation.y = (GTK_CONTAINER (menu_bar)->border_width + - ipadding + BORDER_SPACING); if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE) @@ -344,7 +332,7 @@ gtk_menu_bar_size_allocate (GtkWidget *widget, toggle_size); gtk_widget_size_allocate (child, &child_allocation); - ltr_x += child_allocation.width + CHILD_SPACING * 2; + ltr_x += child_allocation.width; } } } |