Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crashes caused by MateImageMenuItem vs GtkImageMenuItem conflict #1434

Closed
wants to merge 2 commits into from
Closed

Fix crashes caused by MateImageMenuItem vs GtkImageMenuItem conflict #1434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0dd5ab
Revert "Main menus: fix missing Places, System icons"
Feb 25, 2024
2ee30dd
Do not use MateImageMenuItem where it would have to be subclassed
lukefromdc Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 82 additions & 4 deletions mate-panel/panel-menu-items.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ struct _PanelDesktopMenuItemPrivate {
guint append_lock_logout : 1;
};

G_DEFINE_TYPE_WITH_PRIVATE (PanelPlaceMenuItem, panel_place_menu_item, MATE_TYPE_IMAGE_MENU_ITEM)
G_DEFINE_TYPE_WITH_PRIVATE (PanelDesktopMenuItem, panel_desktop_menu_item, MATE_TYPE_IMAGE_MENU_ITEM)
G_DEFINE_TYPE_WITH_PRIVATE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
G_DEFINE_TYPE_WITH_PRIVATE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)

static void activate_uri_on_screen(const char* uri, GdkScreen* screen)
{
Expand Down Expand Up @@ -1437,6 +1437,84 @@ panel_desktop_menu_item_class_init (PanelDesktopMenuItemClass *klass)
gobject_class->finalize = panel_desktop_menu_item_finalize;
}

static char *
menu_escape_underscores_and_prepend (const char *text)
{
GString *escaped_text;
const char *src;
int inserted;

if (!text)
return g_strdup (text);

escaped_text = g_string_sized_new (strlen (text) + 1);
g_string_printf (escaped_text, "_%s", text);

src = text;
inserted = 1;

while (*src) {
gunichar c;

c = g_utf8_get_char (src);

if (c == (gunichar)-1) {
g_warning ("Invalid input string for underscore escaping");
g_string_free (escaped_text, TRUE);
return g_strdup (text);
} else if (c == '_') {
g_string_insert_c (escaped_text,
src - text + inserted, '_');
inserted++;
}

src = g_utf8_next_char (src);
}

return g_string_free (escaped_text, FALSE);
}


static void
setup_gtk_image_menuitem (GtkWidget *menuitem,
GtkIconSize icon_size,
GtkWidget *image,
const char *title)

{
GtkWidget *label;
char *_title;

/* this creates a label with an invisible mnemonic */
label = g_object_new (GTK_TYPE_ACCEL_LABEL, NULL);
_title = menu_escape_underscores_and_prepend (title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _title);
g_free (_title);

gtk_label_set_pattern (GTK_LABEL (label), "");

gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuitem);

gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_yalign (GTK_LABEL (label), 0.5);
gtk_widget_show (label);

gtk_container_add (GTK_CONTAINER (menuitem), label);

if (image) {
gint icon_height = PANEL_DEFAULT_MENU_ICON_SIZE;

gtk_icon_size_lookup (icon_size, NULL, &icon_height);
gtk_widget_show (image);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem),
image);
gtk_image_set_pixel_size (GTK_IMAGE(image), icon_height);
}

gtk_widget_show (menuitem);
}


GtkWidget* panel_place_menu_item_new(gboolean use_image)
{
PanelPlaceMenuItem* menuitem;
Expand All @@ -1453,7 +1531,7 @@ GtkWidget* panel_place_menu_item_new(gboolean use_image)
image = NULL;
}

setup_menuitem(GTK_WIDGET(menuitem), image ? panel_menu_icon_get_size() : GTK_ICON_SIZE_INVALID, image, _("Places"));
setup_gtk_image_menuitem(GTK_WIDGET(menuitem), image ? panel_menu_icon_get_size() : GTK_ICON_SIZE_INVALID, image, _("Places"));

menuitem->priv->use_image = (use_image != FALSE);

Expand All @@ -1478,7 +1556,7 @@ panel_desktop_menu_item_new (gboolean use_image,
else
image = NULL;

setup_menuitem (GTK_WIDGET (menuitem),
setup_gtk_image_menuitem (GTK_WIDGET (menuitem),
image ? panel_menu_icon_get_size () : GTK_ICON_SIZE_INVALID,
image,
_("System"));
Expand Down