AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

label: Make hidden mnemonics work again

Browse Source 
The change in 875a92b95f made labels strip
out underlines earlier, but overlooked that this made
mnemonics not work before the timeout to show them
has passed. That was unintentional. Make mnemonics
work regardless of their visibility, again.
This commit is contained in:
Matthias Clasen 2021-05-05 22:53:52 -04:00
parent 4e2a263c1f
commit d94c386320
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtklabel.c
View File

@ -3153,10 +3153,12 @@ typedef struct
gsize text_len; gsize text_len;
gboolean strip_ulines; gboolean strip_ulines;
GString *text_data; GString *text_data;
gunichar accel_key;
} UriParserData; } UriParserData;
static char * static char *
strip_ulines (const char *text) strip_ulines (const char *text,
guint *accel_key)
{ {
char *new_text; char *new_text;
const char *p; const char *p;
@ -3175,6 +3177,9 @@ strip_ulines (const char *text)
} }
*q = *p; *q = *p;
if (after_uline && *accel_key == 0)
*accel_key = g_utf8_get_char (p);
q++; q++;
after_uline = FALSE; after_uline = FALSE;
} }
@ -3201,7 +3206,7 @@ finish_text (UriParserData *pdata)
if (pdata->strip_ulines && strchr (pdata->text_data->str, '_')) if (pdata->strip_ulines && strchr (pdata->text_data->str, '_'))
{ {
text = strip_ulines (pdata->text_data->str); text = strip_ulines (pdata->text_data->str, &pdata->accel_key);
text_len = strlen (text); text_len = strlen (text);
} }
else else
@ -3404,6 +3409,7 @@ static gboolean
parse_uri_markup (GtkLabel *self, parse_uri_markup (GtkLabel *self,
const char *str, const char *str,
gboolean strip_ulines, gboolean strip_ulines,
gunichar *accel_key,
char **new_str, char **new_str,
GtkLabelLink **links, GtkLabelLink **links,
guint *out_n_links, guint *out_n_links,
@ -3424,6 +3430,7 @@ parse_uri_markup (GtkLabel *self,
pdata.text_len = 0; pdata.text_len = 0;
pdata.strip_ulines = strip_ulines; pdata.strip_ulines = strip_ulines;
pdata.text_data = g_string_new (""); pdata.text_data = g_string_new ("");
pdata.accel_key = 0;
while (p != end && xml_isspace (*p)) while (p != end && xml_isspace (*p))
p++; p++;
@ -3466,6 +3473,9 @@ parse_uri_markup (GtkLabel *self,
*links = NULL; *links = NULL;
} }
if (accel_key)
*accel_key = pdata.accel_key;
return TRUE; return TRUE;
failed: failed:
@ -3509,7 +3519,7 @@ gtk_label_set_markup_internal (GtkLabel *self,
char *str_for_display = NULL; char *str_for_display = NULL;
GtkLabelLink *links = NULL; GtkLabelLink *links = NULL;
guint n_links = 0; guint n_links = 0;
guint accel_keyval = 0; gunichar accel_keyval = 0;
gboolean do_mnemonics; gboolean do_mnemonics;
do_mnemonics = self->mnemonics_visible && do_mnemonics = self->mnemonics_visible &&
@ -3518,6 +3528,7 @@ gtk_label_set_markup_internal (GtkLabel *self,
if (!parse_uri_markup (self, str, if (!parse_uri_markup (self, str,
with_uline && !do_mnemonics, with_uline && !do_mnemonics,
&accel_keyval,
&str_for_display, &str_for_display,
&links, &n_links, &links, &n_links,
&error)) &error))