Mercurial > pidgin.yaz
diff src/gtkmenutray.c @ 11787:c9188d3eb9d3
[gaim-migrate @ 14078]
GtkMenuTray now set's it's minimum height to the height of GTK_ICON_SIZE_MENU. This removes the need for the blank menu item which ended up leaving an empty space when other items were added.
committer: Tailor Script <tailor@pidgin.im>
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Mon, 24 Oct 2005 03:37:31 +0000 |
| parents | 767e3c0c5062 |
| children | 7d2d926704aa |
line wrap: on
line diff
--- a/src/gtkmenutray.c Mon Oct 24 03:31:44 2005 +0000 +++ b/src/gtkmenutray.c Mon Oct 24 03:37:31 2005 +0000 @@ -19,6 +19,9 @@ */ #include "gtkmenutray.h" +#include <gtk/gtkiconfactory.h> +#include <gtk/gtkversion.h> + /****************************************************************************** * Enums *****************************************************************************/ @@ -117,11 +120,28 @@ static void gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { + GtkWidget *widget = GTK_WIDGET(menu_tray); + GtkSettings *settings; + gint height = -1; + gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); if(!GTK_IS_WIDGET(menu_tray->tray)) menu_tray->tray = gtk_hbox_new(FALSE, 0); +#if GTK_CHECK_VERSION(2,2,0) + settings = + gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); +#else + settings = gtk_settings_get_default(); +#endif + + if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, + NULL, &height)) + { + gtk_widget_set_size_request(widget, -1, height); + } + gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray); gtk_widget_show(menu_tray->tray);