Merged revision(s) 49893 #337e3a4589 from trunk:

IDE: Fix 2 stage key-combos issue #0027992
........

git-svn-id: branches/fixes_1_4@49900 -
This commit is contained in:
maxim 2015-09-29 22:24:14 +00:00
parent 8cc0b065b0
commit 4150308e4b

View File

@ -3473,8 +3473,10 @@ var
// Ignore the second Ctrl key in sequential combos unless both variations are defined.
// For example "Ctrl-X, Y" and "Ctrl-X, Ctrl-Y" are then treated the same.
if (aKey.Key2<>VK_UNKNOWN) and (aKey.Shift=[ssCtrl]) and (aKey.Shift2-[ssCtrl]=[])
and not ShiftConflict(aKey) then
aKey.ShiftMask2:=[ssCtrl]
and not ShiftConflict(aKey) then begin
aKey.ShiftMask2:=[ssCtrl];
aKey.Shift2:=[];
end
else
aKey.ShiftMask2:=[];
end;