ide/Panels: (#965) Fixed non-sensical repositioning of Windows on activation

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index 39ecb66..2e9cc4b 100644 (file)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -466,13 +466,6 @@ class IDEWorkSpace : Window
          return true;
       }
 
-      bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
-      {
-         if(active)
-            ide.RepositionWindows(false);
-         return true;
-      }
-
       bool OnClose(bool parentClosing)
       {
          visible = false;
@@ -543,13 +536,6 @@ class IDEWorkSpace : Window
          return true;
       }
 
-      bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
-      {
-         if(active)
-            ide.RepositionWindows(false);
-         return true;
-      }
-
       bool OnClose(bool parentClosing)
       {
          visible = false;
@@ -630,13 +616,6 @@ class IDEWorkSpace : Window
          return true;
       }
 
-      bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
-      {
-         if(active)
-            ide.RepositionWindows(false);
-         return true;
-      }
-
       bool OnClose(bool parentClosing)
       {
          visible = false;
@@ -710,6 +689,7 @@ class IDEWorkSpace : Window
                   {
                      if(!projectView && gotWhatWeWant)
                         ChangeFileDialogsDirectory(ideFileDialog.currentDirectory, true);
+                     ide.RepositionWindows(false);
                      break;
                   }
                }
@@ -805,7 +785,10 @@ class IDEWorkSpace : Window
                   delete command;
                }
                else
+               {
                   OpenFile(file, normal, true, isProjectFile ? "txt" : null, no, normal, mods.ctrl && mods.shift);
+                  ide.RepositionWindows(false);
+               }
                break;
             }
             id++;
@@ -1619,6 +1602,7 @@ class IDEWorkSpace : Window
                anchor.bottom = bottomDistance;
                if(child._class == class(CodeEditor) || child._class == class(Designer))
                {
+                  anchor.left = 300;
                   anchor.right = toolBoxVisible ? 150 : 0;
                }
                child.anchor = anchor;
@@ -2159,6 +2143,7 @@ class IDEWorkSpace : Window
                               }
                            }
                         }
+                        ide.RepositionWindows(false);
                         workspace.holdTracking = false;
 
                         workspace.timer.Start();

diff --git a/ide/src/panels/BreakpointsView.ec b/ide/src/panels/BreakpointsView.ec
index e00bd62..d3a0602 100644 (file)
--- a/ide/src/panels/BreakpointsView.ec
+++ b/ide/src/panels/BreakpointsView.ec
@@ -142,13 +142,6 @@ class BreakpointsView : Window
       return true;
    }
 
-   bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
-   {
-      if(active)
-         ide.RepositionWindows(false);
-      return true;
-   }
-
    bool OnClose(bool parentClosing)
    {
       visible = false;
@@ -189,6 +182,7 @@ class BreakpointsView : Window
    void Show()
    {
       visible = true;
+      ide.RepositionWindows(false);
       Activate();
    }
 

diff --git a/ide/src/panels/CallStackView.ec b/ide/src/panels/CallStackView.ec
index 7544ed0..2fbd364 100644 (file)
--- a/ide/src/panels/CallStackView.ec
+++ b/ide/src/panels/CallStackView.ec
@@ -153,6 +153,7 @@ class CallStackView : Window
    void Show()
    {
       visible = true;
+      ide.RepositionWindows(false);
       Activate();
    }
 }

diff --git a/ide/src/panels/OutputView.ec b/ide/src/panels/OutputView.ec
index 8c8840c..40bf319 100644 (file)
--- a/ide/src/panels/OutputView.ec
+++ b/ide/src/panels/OutputView.ec
@@ -243,6 +243,7 @@ class OutputView : Window
    void Show()
    {
       visible = true;
+      ide.RepositionWindows(false);
       Activate();
    }
    void ShowClearSelectTab(OutputViewTab tab)

diff --git a/ide/src/panels/ThreadsView.ec b/ide/src/panels/ThreadsView.ec
index 5bbf1c3..0b02522 100644 (file)
--- a/ide/src/panels/ThreadsView.ec
+++ b/ide/src/panels/ThreadsView.ec
@@ -177,6 +177,7 @@ class ThreadsView : Window
    void Show()
    {
       visible = true;
+      ide.RepositionWindows(false);
       Activate();
    }
 

diff --git a/ide/src/panels/WatchesView.ec b/ide/src/panels/WatchesView.ec
index b09fe90..f0c1639 100644 (file)
--- a/ide/src/panels/WatchesView.ec
+++ b/ide/src/panels/WatchesView.ec
@@ -94,16 +94,6 @@ class WatchesView : Window
       return true;
    }
 
-   bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
-   {
-      if(active)
-      {
-         //listBox.SelectRow(listBox.firstRow);
-         ide.RepositionWindows(false);
-      }
-      return true;
-   }
-
    bool OnClose(bool parentClosing)
    {
       visible = false;
@@ -115,6 +105,7 @@ class WatchesView : Window
    void Show()
    {
       visible = true;
+      ide.RepositionWindows(false);
       Activate();
    }
 

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index f944c38..fc3d7ba 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -2225,6 +2225,7 @@ class ProjectView : Window
          }
       }
       selection.Free(null);
+      ide.RepositionWindows(false);
       return result;
    }
 

diff --git a/ide/src/project/Workspace.ec b/ide/src/project/Workspace.ec
index c577a00..bdff439 100644 (file)
--- a/ide/src/project/Workspace.ec
+++ b/ide/src/project/Workspace.ec
@@ -1207,6 +1207,5 @@ Workspace LoadWorkspace(char * filePath, char * fromProjectFile)
       if(!workspace.compiler || !workspace.compiler[0])
          workspace.compiler = defaultCompilerName;
    }
-
    return workspace;
 }