mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: support 'Fn' key as modifier for ShortCut on macOS

Browse source
This commit is contained in:
rich2014 2026-05-16 15:36:30 +08:00
commit d8426b25b6
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/platform/ukeyboard.pas
View file

@ -18,7 +18,7 @@ type
TMenuKeyCap = (mkcClear, mkcBkSp, mkcTab, mkcEsc, mkcEnter, mkcSpace, mkcPgUp,
mkcPgDn, mkcEnd, mkcHome, mkcLeft, mkcUp, mkcRight, mkcDown, mkcIns,
mkcDel, mkcShift, mkcCtrl, mkcAlt, mkcMeta, mkcNumDivide, mkcNumMultiply,
mkcNumAdd, mkcNumSubstract);
mkcNumAdd, mkcNumSubstract, mkcAltGr);
const
SmkcClear = 'Clear';
@ -49,12 +49,13 @@ const
SmkcAtem = {$IF DEFINED(DARWIN)}SmkcWin{$ELSE}SmkcCmd{$ENDIF};
SmkcMeta = {$IF DEFINED(DARWIN)}SmkcCmd{$ELSE}SmkcWin{$ENDIF};
SmkcSuper = {$IF DEFINED(DARWIN)}SmkcCmd{$ELSE}SmkcCtrl{$ENDIF};
SmkcFn = 'Fn+';
MenuKeyCaps: array[TMenuKeyCap] of string = (
SmkcClear, SmkcBkSp, SmkcTab, SmkcEsc, SmkcEnter, SmkcSpace, SmkcPgUp,
SmkcPgDn, SmkcEnd, SmkcHome, SmkcLeft, SmkcUp, SmkcRight, SmkcDown,
SmkcIns, SmkcDel, SmkcShift, SmkcCtrl, SmkcAlt, SmkcMeta,
SmkcNumDivide, SmkcNumMultiply, SmkcNumAdd, SmkcNumSubstract);
SmkcNumDivide, SmkcNumMultiply, SmkcNumAdd, SmkcNumSubstract, SmkcFn);
// Modifiers that can be used for shortcuts (non-toggable).
KeyModifiersShortcut = [ssShift, ssAlt, ssCtrl, ssMeta, ssSuper, ssHyper, ssAltGr];
@ -185,11 +186,12 @@ type
end;
const
ModifiersMap: array [0..3] of TModifiersMap =
ModifiersMap: array [0..4] of TModifiersMap =
((Shift: ssCtrl; Shortcut: scCtrl; Text: mkcCtrl),
(Shift: ssShift; Shortcut: scShift; Text: mkcShift),
(Shift: ssAlt; Shortcut: scAlt; Text: mkcAlt),
(Shift: ssMeta; Shortcut: scMeta; Text: mkcMeta)
(Shift: ssMeta; Shortcut: scMeta; Text: mkcMeta),
(Shift: ssAltGr; Shortcut: scAltGr; Text: mkcAltGr)
);
{$IF DEFINED(X11)}
@ -472,6 +474,11 @@ begin
if IsKeyDown(VK_LWIN) or IsKeyDown(VK_RWIN) then
Include(Result, ssMeta);
{$IF DEFINED(DARWIN)}
if IsKeyDown(VK_FN) then
Include(Result, ssAltGr);
{$ENDIF}
{$IF DEFINED(X11) and (DEFINED(LCLQT5) OR DEFINED(LCLQT6))}
if IsKeyDown(VK_CAPITAL) then
Include(Result, ssCaps);