From c9714692aad3ccc378f5bc36410521c56daf05dd Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 26 Jul 2003 13:22:42 +0000 Subject: [PATCH] don't request toggle_space when the image width is 0. Sat Jul 26 15:21:27 2003 Soeren Sandmann * gtk/gtkimagemenuitem.c (gtk_image_menu_item_toggle_size_request): don't request toggle_space when the image width is 0. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkimagemenuitem.c | 20 ++++++++++++-------- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 460210bf55..d4b5cfc0c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 26 15:21:27 2003 Soeren Sandmann + + * gtk/gtkimagemenuitem.c + (gtk_image_menu_item_toggle_size_request): don't request + toggle_space when the image width is 0. + 2003-07-25 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 460210bf55..d4b5cfc0c9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jul 26 15:21:27 2003 Soeren Sandmann + + * gtk/gtkimagemenuitem.c + (gtk_image_menu_item_toggle_size_request): don't request + toggle_space when the image width is 0. + 2003-07-25 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 460210bf55..d4b5cfc0c9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jul 26 15:21:27 2003 Soeren Sandmann + + * gtk/gtkimagemenuitem.c + (gtk_image_menu_item_toggle_size_request): don't request + toggle_space when the image width is 0. + 2003-07-25 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 460210bf55..d4b5cfc0c9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jul 26 15:21:27 2003 Soeren Sandmann + + * gtk/gtkimagemenuitem.c + (gtk_image_menu_item_toggle_size_request): don't request + toggle_space when the image width is 0. + 2003-07-25 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 460210bf55..d4b5cfc0c9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jul 26 15:21:27 2003 Soeren Sandmann + + * gtk/gtkimagemenuitem.c + (gtk_image_menu_item_toggle_size_request): don't request + toggle_space when the image width is 0. + 2003-07-25 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index 9dd1376d2a..60542d87dd 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -184,18 +184,22 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item, { GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (menu_item); + *requisition = 0; + if (image_menu_item->image) { - guint toggle_spacing; + guint image_width = image_menu_item->image->requisition.width; - gtk_widget_style_get (GTK_WIDGET (menu_item), - "toggle_spacing", &toggle_spacing, - NULL); - - *requisition = image_menu_item->image->requisition.width + toggle_spacing; + if (image_width > 0) + { + guint toggle_spacing; + gtk_widget_style_get (GTK_WIDGET (menu_item), + "toggle_spacing", &toggle_spacing, + NULL); + + *requisition = image_width + toggle_spacing; + } } - else - *requisition = 0; }