Fixed #10 and #12

Author: avarayr

SublimeOverlay/ChildTracker.cs

@@ -35,11 +35,15 @@ static void WinEventProc(IntPtr hWinEventHook, uint eventType,
             {
                 return;
             }
+            RestoreWindow(hwnd);
+            ChildMinimized();
+        }
+        public static void RestoreWindow(IntPtr hwnd)
+        {
             NativeMethods.WINDOWPLACEMENT windowPlacement = new NativeMethods.WINDOWPLACEMENT();
             NativeMethods.GetWindowPlacement(hwnd, ref windowPlacement);
             windowPlacement.showCmd = 9; /* SW_RESTORE */
             NativeMethods.SetWindowPlacement(hwnd, ref windowPlacement);
-            ChildMinimized();
         }
     }
 }

SublimeOverlay/MainForm.cs

@@ -110,12 +110,17 @@ private void DockWindow()
                     Application.Exit();
                 return;
             }
+            pDocked.EnableRaisingEvents = true;
+            pDocked.Exited += editor_Exited;
+            ChildTracker.RestoreWindow(pDocked.MainWindowHandle);
             HideTitleBar(pDocked.MainWindowHandle);
             NativeMethods.SetWindowLong(pDocked.MainWindowHandle, -8 /* OWNER */, (int)container.Handle);
+            FitToWindow();
             InvalidateWindow(pDocked.MainWindowHandle);
             NativeMethods.SendMessage(pDocked.MainWindowHandle, (uint)0x000F /* WMPAINT */, UIntPtr.Zero, IntPtr.Zero);
-            FitToWindow();
         }
+
+        
         public void ToggleTitle()
         {
             titleWatcher.Enabled = !titleWatcher.Enabled;
@@ -165,7 +170,10 @@ private void MainForm_Load(object sender, EventArgs e)
             ParseArgs();
             Initialize();
         }
-
+        private void editor_Exited(object sender, EventArgs e)
+        {
+            Environment.Exit(0);
+        }
         private void ParseArgs()
         {
             string[] args = Environment.GetCommandLineArgs();
@@ -289,7 +297,14 @@ private void Drag(object sender, MouseEventArgs e)
 
         private void closeButton_Click(object sender, EventArgs e)
         {
-            Close();
+            if (pDocked != null)
+            {
+                pDocked.CloseMainWindow();
+            }
+            else
+            {
+                Environment.Exit(0);
+            }
         }
 
         private void maximizeButton_Click(object sender, EventArgs e)