paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-25 18:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, SynEdit: Use the new ShiftMask feature in SynEdit to ignore Ctrl key in two-key sequences. Part of issue

Browse Source 
git-svn-id: trunk@40549 -
This commit is contained in:
juha 2013-03-14 12:21:59 +00:00
parent 869f674baf
commit ac54b82dcb
2 changed files with 32 additions and 35 deletions
components/synedit
syneditkeycmds.pp
ide
keymapping.pp

16
components/synedit/syneditkeycmds.pp
View File

@ -1026,15 +1026,15 @@ var
begin
Result := -1;
for x := 0 to Count-1 do
// If first key requires CTRL, ignore CTRL status on 2nd key
// If ShiftMask2 = [ssCtrl] and shortcut is "Ctrl-X, Y", then both
// "Ctrl-X, Y" and "Ctrl-X, Ctrl-Y" are accepted. The second CTRL is ignored.
with Items[x] do
if (Key = Code1) and (Shift = SS1 - ShiftMask) and
(Key2 = Code2) and ((Shift2 = SS2 - ShiftMask2) or
((Shift2 = (SS2 >< [ssCtrl])) and (Shift = [ssCtrl]))) then
begin
Result := x;
break;
end;
if (Key = Code1) and (Shift = SS1 - ShiftMask)
and (Key2 = Code2) and (Shift2 = SS2 - ShiftMask2) then
begin
Result := x;
break;
end;
end;
function TSynEditKeyStrokes.FindKeycode2Start(Code: word; SS: TShiftState): integer;

51
ide/keymapping.pp
View File

@ -3411,6 +3411,20 @@ end;
procedure TKeyCommandRelationList.AssignTo(ASynEditKeyStrokes: TSynEditKeyStrokes;
IDEWindowClass: TCustomFormClass; ACommandOffsetOffset: Integer = 0);
procedure SetKeyCombo(aKey: TSynEditKeyStroke; aShortcut: PIDEShortCut);
// Define a key for a command
begin
aKey.Key :=aShortcut^.Key1;
aKey.Shift :=aShortcut^.Shift1;
aKey.Key2 :=aShortcut^.Key2;
aKey.Shift2:=aShortcut^.Shift2;
// Ignore the second Ctrl key in sequential combos.
// For example "Ctrl-X, Y" and "Ctrl-X, Ctrl-Y" are then treated the same.
if aKey.Shift=[ssCtrl] then
aKey.ShiftMask2:=[ssCtrl];
end;
var
i,j,MaxKeyCnt,KeyCnt:integer;
Key: TSynEditKeyStroke;
@ -3449,22 +3463,12 @@ begin
if (ccid >= ecFirstPlugin) and (ccid < ecLastPlugin) then
ccid := ccid + ACommandOffsetOffset;
if Key.Command=ccid then begin
if KeyCnt>MaxKeyCnt then begin
// All keys with this command are already defined -> delete this one
Key.Free;
end else if KeyCnt=1 then begin
// Define key1 for this command
Key.Key:=CurRelation.ShortcutA.Key1;
Key.Shift:=CurRelation.ShortcutA.Shift1;
Key.Key2:=CurRelation.ShortcutA.Key2;
Key.Shift2:=CurRelation.ShortcutA.Shift2;
end else if KeyCnt=2 then begin
// Define key2 for this command
Key.Key:=CurRelation.ShortcutB.Key1;
Key.Shift:=CurRelation.ShortcutB.Shift1;
Key.Key2:=CurRelation.ShortcutB.Key2;
Key.Shift2:=CurRelation.ShortcutB.Shift2;
end;
if KeyCnt>MaxKeyCnt then
Key.Free // All keys with this command are already defined -> delete this one
else if KeyCnt=1 then
SetKeyCombo(Key, @CurRelation.ShortcutA) // Key1 for this command
else if KeyCnt=2 then
SetKeyCombo(Key, @CurRelation.ShortcutB); // Key2 for this command
inc(KeyCnt);
end
else
@ -3496,17 +3500,10 @@ begin
if (ccid >= ecFirstPlugin) and (ccid < ecLastPlugin) then
ccid := ccid + ACommandOffsetOffset;
Key.Command:=ccid;
if KeyCnt=1 then begin
Key.Key:=CurRelation.ShortcutA.Key1;
Key.Shift:=CurRelation.ShortcutA.Shift1;
Key.Key2:=CurRelation.ShortcutA.Key2;
Key.Shift2:=CurRelation.ShortcutA.Shift2;
end else begin
Key.Key:=CurRelation.ShortcutB.Key1;
Key.Shift:=CurRelation.ShortcutB.Shift1;
Key.Key2:=CurRelation.ShortcutB.Key2;
Key.Shift2:=CurRelation.ShortcutB.Shift2;
end;
if KeyCnt=1 then
SetKeyCombo(Key, @CurRelation.ShortcutA)
else
SetKeyCombo(Key, @CurRelation.ShortcutB);
inc(KeyCnt);
end;
end;