summaryrefslogtreecommitdiff
path: root/garcon-gtk
diff options
context:
space:
mode:
authorSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2020-05-12 23:43:02 +0200
committerSimon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>2020-05-12 23:43:02 +0200
commitdceac166a4d07b1ed216241f98440f16d136c321 (patch)
tree9a3ab483dc4a7bb7be6e2b3e2e59fa0aba40fe93 /garcon-gtk
parent431a68d7aca9b76b4b92da8b04f24876a5739eb5 (diff)
downloadgarcon-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.
Diffstat (limited to 'garcon-gtk')
-rw-r--r--garcon-gtk/garcon-gtk-menu.c21
1 files changed, 1 insertions, 20 deletions
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;
}