diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 10 | ||||
| -rw-r--r-- | gtk/gtklistitem.c | 3 | ||||
| -rw-r--r-- | gtk/gtkoptionmenu.c | 11 |
9 files changed, 80 insertions, 4 deletions
@@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c69192c509..c62dd7a1fc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +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 diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index d6f7a1d40b..996fb618e6 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.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); diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 8e7856ce70..458a8fe431 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -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); + } } } } |