From: Jerome St-Louis <jerome@ecere.com>
Date: Fri, 15 Jul 2016 02:55:16 +0000 (-0400)
Subject: ide/designer: (#1112) Fixed toggling Form designer moving caret
X-Git-Tag: 0.44.15~118
X-Git-Url: http://ecere.com/cgi-bin/gitweb.cgi?p=sdk;a=commitdiff_plain;h=8dee6c474443e4f4da1d6a9f898999640135d245

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
---

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;
    }