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

fix, focused editor opts not applied after changes in the shortcut editor

This commit is contained in:
Basile Burg 2020-12-24 15:41:41 +01:00
parent 3b46ffb013
commit 3352eef838
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Bugs fixed ## Bugs fixed
- Editor tabs: caption not updated when split page is closed using the File menu or the shortcut. - Editor tabs: caption not updated when split page is closed using the File menu or the shortcut.
- Editor shortcuts: no applied to current editor until restart or file close/reopen.
# v3.9.9 # v3.9.9

5
src/u_editoroptions.pas
View File

@ -594,6 +594,8 @@ var
begin begin
s := TPersistentShortcut(fShortCuts.Items[index]); s := TPersistentShortcut(fShortCuts.Items[index]);
s.shortcut := item.shortcut; s.shortcut := item.shortcut;
if index = scedCount - 1 then
applyChangesFromSelf();
end; end;
{$ENDREGION} {$ENDREGION}
@ -662,7 +664,6 @@ var
i, j: Integer; i, j: Integer;
shc: TPersistentShortcut; shc: TPersistentShortcut;
kst: TSynEditKeyStroke; kst: TSynEditKeyStroke;
dup: boolean;
savedSize: integer; savedSize: integer;
cs: TSysCharSet; cs: TSysCharSet;
c: char; c: char;
@ -759,11 +760,9 @@ begin
kst := anEditor.Keystrokes.Items[i]; kst := anEditor.Keystrokes.Items[i];
for j := 0 to fShortCuts.Count-1 do for j := 0 to fShortCuts.Count-1 do
begin begin
dup := false;
shc := TPersistentShortcut(fShortCuts.Items[j]); shc := TPersistentShortcut(fShortCuts.Items[j]);
if shc.actionName = EditorCommandToCodeString(kst.Command) then if shc.actionName = EditorCommandToCodeString(kst.Command) then
begin begin
if not dup then
try try
kst.shortCut := shc.shortcut; kst.shortCut := shc.shortcut;
except except