From 8dee6c474443e4f4da1d6a9f898999640135d245 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Thu, 14 Jul 2016 22:55:16 -0400
Subject: [PATCH] ide/designer: (#1112) Fixed toggling Form designer moving
 caret - This was happening when code outside a class, even when not making
 any change in designer

---
 ide/src/designer/CodeEditor.ec | 1 +
 ide/src/designer/Designer.ec   | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ide/src/designer/CodeEditor.ec b/ide/src/designer/CodeEditor.ec
index 289d9ac..271fb04 100644
--- a/ide/src/designer/CodeEditor.ec
+++ b/ide/src/designer/CodeEditor.ec
@@ -2610,6 +2610,7 @@ class CodeEditor : Window
 
    void ModifyCode()
    {
+      fixCaret = true;
       selected.modified = true;
       selected.oClass.modified = true;
 
diff --git a/ide/src/designer/Designer.ec b/ide/src/designer/Designer.ec
index 38ca035..544c6e9 100644
--- a/ide/src/designer/Designer.ec
+++ b/ide/src/designer/Designer.ec
@@ -204,14 +204,7 @@ class Designer : DesignerBase
    bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
    {
       if(active)
-      {
          codeEditor.EnsureUpToDate();
-         codeEditor.fixCaret = true;
-         /*
-         if(classDesigner)
-            classDesigner.Activate();
-         */
-      }
       return true;
    }
 
-- 
1.8.3.1