Commit bc99cf97 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Calculate size based on the _child_ of the menu item, not the menuitem.

Sun Nov 25 18:59:19 2001  Owen Taylor  <otaylor@redhat.com>
	* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
	Calculate size based on the _child_ of the menu item,
	not the menuitem. (#65005, Damon Chaplin)
	* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
	some extra vertical padding to the label widget ... restores
	GTK+-1.2 spacing. (#65085, Damon Chaplin.)
parent 9a60bfac
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
Sun Nov 25 18:59:19 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_calc_size):
Calculate size based on the _child_ of the menu item,
not the menuitem. (#65005, Damon Chaplin)
* gtk/gtklistitem.c (gtk_list_item_new_with_label): Add
some extra vertical padding to the label widget ... restores
GTK+-1.2 spacing. (#65085, Damon Chaplin.)
2001-11-26 Tor Lillqvist <tml@iki.fi>
* demos/pixbuf-demo.c
......
......@@ -390,7 +390,8 @@ gtk_list_item_new_with_label (const gchar *label)
list_item = gtk_list_item_new ();
label_widget = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
gtk_misc_set_padding (GTK_MISC (label_widget), 0, 1);
gtk_container_add (GTK_CONTAINER (list_item), label_widget);
gtk_widget_show (label_widget);
......
......@@ -848,10 +848,15 @@ gtk_option_menu_calc_size (GtkOptionMenu *option_menu)
if (GTK_WIDGET_VISIBLE (child))
{
gtk_widget_size_request (child, &child_requisition);
GtkWidget *inner = GTK_BIN (child)->child;
option_menu->width = MAX (option_menu->width, child_requisition.width);
option_menu->height = MAX (option_menu->height, child_requisition.height);
if (inner)
{
gtk_widget_size_request (inner, &child_requisition);
option_menu->width = MAX (option_menu->width, child_requisition.width);
option_menu->height = MAX (option_menu->height, child_requisition.height);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment