From 361502ff6a4e1f8f29ee7fd3614f1737c1368581 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Wed, 15 Jun 2016 07:13:41 +0200
Subject: [PATCH] nextpage, repeated shortcut, not an issue

---
 src/ce_editor.pas  | 15 ++++++++++-----
 src/ce_synmemo.pas | 10 ----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 5a9949d4..d857cc2d 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -9,7 +9,7 @@ uses
   ComCtrls, SynEditHighlighter, ExtCtrls, Menus, SynMacroRecorder, dialogs,
   SynPluginSyncroEdit, SynEdit, SynHighlighterMulti, ce_dialogs,
   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
 
@@ -366,7 +366,6 @@ begin
   fDoc := aDoc;
   focusedEditorChanged;
   updateImperative;
-  fDoc.enterEdit;
 end;
 
 procedure TCEEditorWidget.docChanged(aDoc: TCESynMemo);
@@ -534,18 +533,24 @@ begin
       if Shift = [] then
         updateImperative;
     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);
       if sh = fOptions.fNextPage then
       begin
         pageControl.pageIndex:= (pageControl.pageIndex + 1) mod pageControl.pageCount;
       end
       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
         pageControl.movePageLeft
       else if sh = fOptions.fMoveRight then
-        pageControl.movePageRight
-      else sh := 0;
+        pageControl.movePageRight;
     end;
   end;
   if fKeyChanged then
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 96f2a521..aa937d49 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -192,7 +192,6 @@ type
     constructor Create(aOwner: TComponent); override;
     destructor destroy; override;
     procedure setFocus; override;
-    procedure enterEdit;
     //
     procedure checkFileDate;
     procedure loadFromFile(const aFilename: string);
@@ -601,15 +600,6 @@ begin
     Font.Size := fDefaultFontSize;
 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;
 begin
   inherited;