[gnome-panel/gtk3] menu: Use gtk_widget_set_size_request() instead of handling "size-request" signal
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/gtk3] menu: Use gtk_widget_set_size_request() instead of handling "size-request" signal
- Date: Wed, 19 Jan 2011 13:57:16 +0000 (UTC)
commit ce25692dba6e2a26b10c0d9227453904d696ea2f
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Wed Jan 19 14:02:31 2011 +0100
menu: Use gtk_widget_set_size_request() instead of handling "size-request" signal
gnome-panel/menu.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/gnome-panel/menu.c b/gnome-panel/menu.c
index c3a580a..3316f80 100644
--- a/gnome-panel/menu.c
+++ b/gnome-panel/menu.c
@@ -1126,13 +1126,11 @@ drag_data_get_menu_cb (GtkWidget *widget,
}
static void
-image_menuitem_size_request (GtkWidget *menuitem,
- GtkRequisition *requisition,
- gpointer data)
+image_menuitem_set_size_request (GtkWidget *menuitem,
+ GtkIconSize icon_size)
{
- GtkIconSize icon_size = (GtkIconSize) GPOINTER_TO_INT (data);
- int icon_height;
- int req_height;
+ int icon_height;
+ int req_height;
if (!gtk_icon_size_lookup (icon_size, NULL, &icon_height))
return;
@@ -1146,7 +1144,7 @@ image_menuitem_size_request (GtkWidget *menuitem,
req_height = icon_height;
req_height += (gtk_container_get_border_width (GTK_CONTAINER (menuitem)) +
(gtk_widget_get_style (menuitem))->ythickness) * 2;
- requisition->height = MAX (requisition->height, req_height);
+ gtk_widget_set_size_request (menuitem, -1, req_height);
}
static char *
@@ -1219,9 +1217,7 @@ setup_menuitem (GtkWidget *menuitem,
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
image);
} else if (icon_size != GTK_ICON_SIZE_INVALID)
- g_signal_connect (menuitem, "size_request",
- G_CALLBACK (image_menuitem_size_request),
- GINT_TO_POINTER (icon_size));
+ image_menuitem_set_size_request (menuitem, icon_size);
gtk_widget_show (menuitem);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]