mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
wmaker: fix control shortcut label in window menu
This patch is fixing the shortcut label used in window menu. As now when a 'control' shortcut was used, the label displayed was 'bug' cause GetShortcutString fct which is calling wXModifierFromKey fct was waiting for a 'Control' static string not the default one set to 'Ctrl' string.
This commit is contained in:
committed by
Carlos R. Mafra
parent
371818fe36
commit
9cb4388180
@@ -732,7 +732,6 @@ char *GetShortcutString(const char *shortcut)
|
||||
{
|
||||
char *buffer = NULL;
|
||||
char *k;
|
||||
/* KeySym ksym; */
|
||||
int control = 0;
|
||||
char *tmp, *text;
|
||||
|
||||
@@ -788,7 +787,7 @@ char *GetShortcutKey(WShortKey key)
|
||||
if (!k) return NULL;
|
||||
|
||||
char **m = wPreferences.modifier_labels;
|
||||
if (key.modifier & ControlMask) tmp = wstrappend(tmp, m[1] ? m[1] : "Ctrl+");
|
||||
if (key.modifier & ControlMask) tmp = wstrappend(tmp, m[1] ? m[1] : "Control+");
|
||||
if (key.modifier & ShiftMask) tmp = wstrappend(tmp, m[0] ? m[0] : "Shift+");
|
||||
if (key.modifier & Mod1Mask) tmp = wstrappend(tmp, m[2] ? m[2] : "Mod1+");
|
||||
if (key.modifier & Mod2Mask) tmp = wstrappend(tmp, m[3] ? m[3] : "Mod2+");
|
||||
|
||||
Reference in New Issue
Block a user