summaryrefslogtreecommitdiff
path: root/gtk/gtkoptionmenu.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-01-17 01:37:31 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-01-17 01:37:31 +0000
commit5ce4d1588a9c2b313993ef657c64a6272b53e601 (patch)
treeef8b544385b68cfe16dbccb69aa03b9e42be01b6 /gtk/gtkoptionmenu.c
parent9961ddc205d12615df58b2c06b4b9cefce50f223 (diff)
downloadgtk+-5ce4d1588a9c2b313993ef657c64a6272b53e601.tar.gz
Fix calculation error in the (shouldn't happen) case where
Wed Jan 16 12:16:37 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkoptionmenu.c (gtk_option_menu_size_request): Fix calculation error in the (shouldn't happen) case where option_menu->height < child_requisition.height. (Patch from Jacob Berkman, #66969)
Diffstat (limited to 'gtk/gtkoptionmenu.c')
-rw-r--r--gtk/gtkoptionmenu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 283a09a7ec..5b10f8bccf 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -461,7 +461,7 @@ gtk_option_menu_size_request (GtkWidget *widget,
MAX (child_requisition.height, option_menu->height) +
CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING + props.focus_width * 2);
- tmp = (requisition->height - option_menu->height +
+ tmp = (requisition->height - MAX (child_requisition.height, option_menu->height) +
props.indicator_size.height + props.indicator_spacing.top + props.indicator_spacing.bottom);
requisition->height = MAX (requisition->height, tmp);
}