gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 13:28:05 +01:00
Code Issues Projects Releases Wiki Activity

Update shortcut labels for Other maximization submenu.

Browse Source 
The shortcut labels for items in the "Other maximization" menu were set
at startup and not updated if the user changed the shortcut key.  Thus
the labels shown could be wrong.  They might even be missing if no
shortcut was assigned at startup but was subsequently set during the
session.

We now ensure that the shortcut labels are updated with the menu
whenever preferences are reloaded.
This commit is contained in:
Iain Patterson
2013-10-18 17:38:25 +01:00
committed by Carlos R. Mafra
parent 766e8ad575
commit 82dcc944c2
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/winmenu.c
View File

@@ -481,16 +481,37 @@ static void updateMaximizeMenu(WMenu * menu, WWindow * wwin)
WMenu *smenu = menu->cascades[menu->entries[MC_OTHERMAX]->cascade]; WMenu *smenu = menu->cascades[menu->entries[MC_OTHERMAX]->cascade];
smenu->entries[MAXC_V]->clientdata = wwin; smenu->entries[MAXC_V]->clientdata = wwin;
smenu->entries[MAXC_V]->rtext = GetShortcutKey(wKeyBindings[WKBD_VMAXIMIZE]);
smenu->entries[MAXC_H]->clientdata = wwin; smenu->entries[MAXC_H]->clientdata = wwin;
smenu->entries[MAXC_H]->rtext = GetShortcutKey(wKeyBindings[WKBD_HMAXIMIZE]);
smenu->entries[MAXC_LH]->clientdata = wwin; smenu->entries[MAXC_LH]->clientdata = wwin;
smenu->entries[MAXC_LH]->rtext = GetShortcutKey(wKeyBindings[WKBD_LHMAXIMIZE]);
smenu->entries[MAXC_RH]->clientdata = wwin; smenu->entries[MAXC_RH]->clientdata = wwin;
smenu->entries[MAXC_RH]->rtext = GetShortcutKey(wKeyBindings[WKBD_RHMAXIMIZE]);
smenu->entries[MAXC_TH]->clientdata = wwin; smenu->entries[MAXC_TH]->clientdata = wwin;
smenu->entries[MAXC_TH]->rtext = GetShortcutKey(wKeyBindings[WKBD_THMAXIMIZE]);
smenu->entries[MAXC_BH]->clientdata = wwin; smenu->entries[MAXC_BH]->clientdata = wwin;
smenu->entries[MAXC_BH]->rtext = GetShortcutKey(wKeyBindings[WKBD_BHMAXIMIZE]);
smenu->entries[MAXC_LTC]->clientdata = wwin; smenu->entries[MAXC_LTC]->clientdata = wwin;
smenu->entries[MAXC_LTC]->rtext = GetShortcutKey(wKeyBindings[WKBD_LTCMAXIMIZE]);
smenu->entries[MAXC_RTC]->clientdata = wwin; smenu->entries[MAXC_RTC]->clientdata = wwin;
smenu->entries[MAXC_RTC]->rtext = GetShortcutKey(wKeyBindings[WKBD_RTCMAXIMIZE]);
smenu->entries[MAXC_LBC]->clientdata = wwin; smenu->entries[MAXC_LBC]->clientdata = wwin;
smenu->entries[MAXC_LBC]->rtext = GetShortcutKey(wKeyBindings[WKBD_LBCMAXIMIZE]);
smenu->entries[MAXC_RBC]->clientdata = wwin; smenu->entries[MAXC_RBC]->clientdata = wwin;
smenu->entries[MAXC_RBC]->rtext = GetShortcutKey(wKeyBindings[WKBD_RBCMAXIMIZE]);
smenu->entries[MAXC_MAXIMUS]->clientdata = wwin; smenu->entries[MAXC_MAXIMUS]->clientdata = wwin;
smenu->entries[MAXC_MAXIMUS]->rtext = GetShortcutKey(wKeyBindings[WKBD_MAXIMUS]);
smenu->flags.realized = 0; smenu->flags.realized = 0;
wMenuRealize(smenu); wMenuRealize(smenu);
@@ -563,36 +584,16 @@ static WMenu *makeMaximizeMenu(WScreen * scr)
} }
entry = wMenuAddCallback(menu, _("Maximize vertically"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize vertically"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_VMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize horizontally"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize horizontally"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_HMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize left half"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize left half"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_LHMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize right half"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize right half"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RHMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize top half"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize top half"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_THMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize bottom half"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize bottom half"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_BHMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize left top corner"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize left top corner"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_LTCMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize right top corner"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize right top corner"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RTCMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize left bottom corner"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize left bottom corner"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_LBCMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximize right bottom corner"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximize right bottom corner"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_RBCMAXIMIZE]);
entry = wMenuAddCallback(menu, _("Maximus: tiled maximization"), execMaximizeCommand, NULL); entry = wMenuAddCallback(menu, _("Maximus: tiled maximization"), execMaximizeCommand, NULL);
entry->rtext = GetShortcutKey(wKeyBindings[WKBD_MAXIMUS]);
return menu; return menu;
} }