diff options
author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-05-12 23:43:02 +0200 |
---|---|---|
committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2020-05-12 23:43:02 +0200 |
commit | dceac166a4d07b1ed216241f98440f16d136c321 (patch) | |
tree | 9a3ab483dc4a7bb7be6e2b3e2e59fa0aba40fe93 | |
parent | 431a68d7aca9b76b4b92da8b04f24876a5739eb5 (diff) | |
download | garcon-dceac166a4d07b1ed216241f98440f16d136c321.tar.gz |
Switch to xfce_gtk_image_menu_item
This also means we need to bump our dependency to libxfce4ui to version
4.15.2, which contains the new widget.
-rw-r--r-- | configure.ac.in | 2 | ||||
-rw-r--r-- | garcon-gtk/garcon-gtk-menu.c | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/configure.ac.in b/configure.ac.in index bcc1089..7700743 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -128,7 +128,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.30.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.15.2]) dnl ************************* dnl *** Check for gtk-doc *** diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c index 332ef63..530d681 100644 --- a/garcon-gtk/garcon-gtk-menu.c +++ b/garcon-gtk/garcon-gtk-menu.c @@ -715,22 +715,7 @@ garcon_gtk_menu_create_menu_item (gboolean show_menu_icons, const gchar *icon_name) { GtkWidget *mi; - GtkWidget *box; GtkWidget *image; - GtkWidget *label; - - /* create item */ - mi = gtk_menu_item_new (); - label = gtk_label_new (name); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_widget_set_halign (label, GTK_ALIGN_START); -#else - box = gtk_hbox_new (FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); -#endif if (show_menu_icons) { @@ -742,11 +727,7 @@ garcon_gtk_menu_create_menu_item (gboolean show_menu_icons, image = gtk_image_new (); } - /* Add the image and label to the box, add the box to the menu item */ - gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 6); - gtk_widget_show_all (box); - gtk_container_add (GTK_CONTAINER (mi), box); + mi = xfce_gtk_image_menu_item_new (name, NULL, NULL, NULL, NULL, image, NULL); return mi; } |