AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

label: Only parse mnemonic attributes if we need to

Browse Source
This commit is contained in:
Timm Bäder 2020-04-14 11:11:08 +02:00
parent 6289f7eecd
commit 78e6475f9f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtklabel.c
View File

@ -2284,7 +2284,8 @@ no_uline:
self->mnemonic_keyval = accel_keyval; self->mnemonic_keyval = accel_keyval;
/* Extract the text to display */ /* Extract the text to display */
if (!pango_parse_markup (new_text, -1, '_', &attrs, &text, NULL, &error)) if (!pango_parse_markup (new_text, -1, '_',
do_mnemonics ? &attrs : NULL, &text, NULL, &error))
goto error_set; goto error_set;
if (do_mnemonics) if (do_mnemonics)
@ -2312,14 +2313,12 @@ no_uline:
if (text) if (text)
gtk_label_set_text_internal (self, text); gtk_label_set_text_internal (self, text);
if (attrs)
{
g_clear_pointer (&self->markup_attrs, pango_attr_list_unref);
self->markup_attrs = attrs;
if (mnemonic_attr) g_clear_pointer (&self->markup_attrs, pango_attr_list_unref);
pango_attr_list_insert_before (self->markup_attrs, mnemonic_attr); self->markup_attrs = attrs;
}
if (mnemonic_attr)
pango_attr_list_insert_before (self->markup_attrs, mnemonic_attr);
return; return;