forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #306 - WordEndRight cannot be set to Ctrl+Right

This commit is contained in:
Basile Burg 2018-04-26 17:01:46 +02:00
parent 80c81cce1e
commit f8c2f1f6fa
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ce_editoroptions.pas
View File

@ -737,6 +737,10 @@ begin
include(cs, c); include(cs, c);
anEditor.closeCompletionChars:=cs; anEditor.closeCompletionChars:=cs;
for i := 0 to anEditor.Keystrokes.Count-1 do
anEditor.Keystrokes.Items[i].ShortCut:=0;
anEditor.Keystrokes.BeginUpdate;
for i := 0 to anEditor.Keystrokes.Count-1 do for i := 0 to anEditor.Keystrokes.Count-1 do
begin begin
kst := anEditor.Keystrokes.Items[i]; kst := anEditor.Keystrokes.Items[i];
@ -746,22 +750,20 @@ begin
shc := TCEPersistentShortcut(fShortCuts.Items[j]); shc := TCEPersistentShortcut(fShortCuts.Items[j]);
if shc.actionName = EditorCommandToCodeString(kst.Command) then if shc.actionName = EditorCommandToCodeString(kst.Command) then
begin begin
try for k := j + 1 to fShortCuts.Count-1 do
for k := 0 to i-1 do if (TCEPersistentShortcut(fShortCuts.Items[k]).shortcut = shc.shortcut) and
if anEditor.Keystrokes.Items[k].shortCut = shc.shortcut then (shc.shortCut <> 0) and (k <> j) then
if shc.shortCut <> 0 then begin
dup := true; dup := true;
if not dup then break;
kst.shortCut := shc.shortcut;
except
kst.shortCut := 0;
shc.shortcut := 0;
// in case of conflict synedit raises an exception.
end; end;
break; if not dup then
kst.shortCut := shc.shortcut;
end; end;
break;
end; end;
end; end;
anEditor.Keystrokes.EndUpdate;
end; end;
{$ENDREGION} {$ENDREGION}