From 7dde429dfb19859b4229875a460cdf252395b4bc Mon Sep 17 00:00:00 2001 From: Matthieu Baerts Date: Sat, 3 Jan 2015 16:38:52 +0100 Subject: [PATCH 1/3] make dist: ignore git stuff --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ea87447f..738f75d8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ add_definitions (-DGL_GLEXT_PROTOTYPES="1") set (CPACK_SOURCE_GENERATOR "TGZ") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}") set (CPACK_SOURCE_IGNORE_FILES - "/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}") + "/build/;/.bzr/;/.bzrignore$;/.git/;/.gitignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}") include (CPack) add_custom_target(dist From 333dc5c25c624ef946617441fd3ae978ceaac473 Mon Sep 17 00:00:00 2001 From: Matthieu Baerts Date: Thu, 29 Jan 2015 01:22:19 +0100 Subject: [PATCH 2/3] GMenu: force icon' size to avoid bigger images Change needed with GTK 3.14. --- GMenu/src/applet-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GMenu/src/applet-tree.c b/GMenu/src/applet-tree.c index 3bf4411ad..aadb431fc 100755 --- a/GMenu/src/applet-tree.c +++ b/GMenu/src/applet-tree.c @@ -76,7 +76,7 @@ static void add_image_to_menu_item (GtkWidget *image_menu_item, { // make a GtkImage GtkWidget *image = gtk_image_new (); - gtk_widget_set_size_request (image, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize); + gtk_image_set_pixel_size (GTK_IMAGE (image), myData.iPanelDefaultMenuIconSize); // force size if (pIcon) // this just sets the gicon on the image, it doesn't load the pixbuf. gtk_image_set_from_gicon (GTK_IMAGE (image), pIcon, GTK_ICON_SIZE_LARGE_TOOLBAR); From dcd1620c94ec88b18088e4cc268110acddf86158 Mon Sep 17 00:00:00 2001 From: Matthieu Baerts Date: Thu, 29 Jan 2015 01:25:38 +0100 Subject: [PATCH 3/3] GMenu: also force size in Entries --- GMenu/src/applet-entry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GMenu/src/applet-entry.c b/GMenu/src/applet-entry.c index 704c208e7..aca854273 100755 --- a/GMenu/src/applet-entry.c +++ b/GMenu/src/applet-entry.c @@ -115,6 +115,8 @@ static void _add_results_in_menu (GldiModuleInstance *myApplet) { GtkWidget *pImage = gtk_image_new_from_gicon (pIcon, GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_image_set_pixel_size (GTK_IMAGE (pImage), + myData.iPanelDefaultMenuIconSize); // force size gldi_menu_item_set_image (pInfo->pMenuItem, pImage); }