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

nextpage, repeated shortcut, not an issue

This commit is contained in:
Basile Burg 2016-06-15 07:13:41 +02:00
parent 573b14854b
commit 361502ff6a
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ce_editor.pas
View File

@ -9,7 +9,7 @@ uses
ComCtrls, SynEditHighlighter, ExtCtrls, Menus, SynMacroRecorder, dialogs, ComCtrls, SynEditHighlighter, ExtCtrls, Menus, SynMacroRecorder, dialogs,
SynPluginSyncroEdit, SynEdit, SynHighlighterMulti, ce_dialogs, SynPluginSyncroEdit, SynEdit, SynHighlighterMulti, ce_dialogs,
ce_widget, ce_interfaces, ce_synmemo, ce_dlang, ce_common, ce_dcd, ce_observer, ce_widget, ce_interfaces, ce_synmemo, ce_dlang, ce_common, ce_dcd, ce_observer,
ce_sharedres, ce_controls, ce_writableComponent, LMessages; ce_sharedres, ce_controls, ce_writableComponent;
type type
@ -366,7 +366,6 @@ begin
fDoc := aDoc; fDoc := aDoc;
focusedEditorChanged; focusedEditorChanged;
updateImperative; updateImperative;
fDoc.enterEdit;
end; end;
procedure TCEEditorWidget.docChanged(aDoc: TCESynMemo); procedure TCEEditorWidget.docChanged(aDoc: TCESynMemo);
@ -534,18 +533,24 @@ begin
if Shift = [] then if Shift = [] then
updateImperative; updateImperative;
else begin else begin
// note: keys conflict can lead to a lose of focus, i.e shortcut
// to select next page cant be repeated.
sh := KeyToShortCut(Key, shift); sh := KeyToShortCut(Key, shift);
if sh = fOptions.fNextPage then if sh = fOptions.fNextPage then
begin begin
pageControl.pageIndex:= (pageControl.pageIndex + 1) mod pageControl.pageCount; pageControl.pageIndex:= (pageControl.pageIndex + 1) mod pageControl.pageCount;
end end
else if sh = fOptions.fPrevPage then else if sh = fOptions.fPrevPage then
pageControl.pageIndex:= (pageControl.pageIndex - 1) mod pageControl.pageCount begin
if pageControl.pageIndex - 1 < 0 then
pageControl.pageIndex:= pageControl.pageCount - 1
else
pageControl.pageIndex:= pageControl.pageIndex - 1;
end
else if sh = fOptions.fMoveLeft then else if sh = fOptions.fMoveLeft then
pageControl.movePageLeft pageControl.movePageLeft
else if sh = fOptions.fMoveRight then else if sh = fOptions.fMoveRight then
pageControl.movePageRight pageControl.movePageRight;
else sh := 0;
end; end;
end; end;
if fKeyChanged then if fKeyChanged then

10
src/ce_synmemo.pas
View File

@ -192,7 +192,6 @@ type
constructor Create(aOwner: TComponent); override; constructor Create(aOwner: TComponent); override;
destructor destroy; override; destructor destroy; override;
procedure setFocus; override; procedure setFocus; override;
procedure enterEdit;
// //
procedure checkFileDate; procedure checkFileDate;
procedure loadFromFile(const aFilename: string); procedure loadFromFile(const aFilename: string);
@ -601,15 +600,6 @@ begin
Font.Size := fDefaultFontSize; Font.Size := fDefaultFontSize;
end; end;
procedure TCESynMemo.enterEdit;
var
key: word = 0;
begin
//MouseDown(mbLeft, [], CaretXPix, CaretYPix);
//MouseUp(mbLeft, [], CaretXPix, CaretYPix);
//TODO-cbugfix: editor has not the input focus after Ctrl+Tab (after pagecontrol.nextPage via shortcut)
end;
procedure TCESynMemo.setFocus; procedure TCESynMemo.setFocus;
begin begin
inherited; inherited;