Rework formula edit watcher and window handling

Author: govert

Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs

@@ -131,7 +131,9 @@ void StateUpdate(object sender, UIStateUpdate update)
                     FormulaEditMove(fem.EditWindowBounds, fem.ExcelTooltipBounds);
                     break;
                 case UIStateUpdate.UpdateType.FormulaEditWindowChange:
-                    UpdateFormulaEditWindow((update.NewState as UIState.FormulaEdit).FormulaEditWindow);
+                    var fewc = (UIState.FormulaEdit)update.NewState;
+                    UpdateFormulaEditWindow(fewc.FormulaEditWindow);
+                    FormulaEditTextChange(fewc.FormulaPrefix, fewc.EditWindowBounds, fewc.ExcelTooltipBounds);
                     break;
                 case UIStateUpdate.UpdateType.FormulaEditTextChange:
                     var fetc = (UIState.FormulaEdit)update.NewState;
@@ -176,7 +178,13 @@ void UpdateFormulaEditWindow(IntPtr formulaEditWindow)
                 _formulaEditWindow = formulaEditWindow;
                 if (_argumentsToolTip != null)
                 {
-                    _argumentsToolTip.OwnerHandle = _formulaEditWindow;
+                    _argumentsToolTip.Dispose();
+                    _argumentsToolTip = null;
+                }
+                if (_formulaEditWindow != IntPtr.Zero)
+                {
+                    _argumentsToolTip = new ToolTipForm(_formulaEditWindow);
+                    //_argumentsToolTip.OwnerHandle = _formulaEditWindow;
                 }
             }
         }
@@ -188,26 +196,33 @@ void UpdateFunctionListWindow(IntPtr functionListWindow)
                 _functionListWindow = functionListWindow;
                 if (_descriptionToolTip != null)
                 {
-                    _descriptionToolTip.OwnerHandle = _functionListWindow;
+                    _descriptionToolTip.Dispose();
+                    _descriptionToolTip = null;
                 }
+                if (_functionListWindow != IntPtr.Zero)
+                {
+                    _descriptionToolTip = new ToolTipForm(_functionListWindow);
+                    //_descriptionToolTip.OwnerHandle = _functionListWindow;
+                }
+                
             }
         }
 
         // Runs on the main thread
         void FormulaEditStart()
         {
             Debug.Print($"IntelliSenseDisplay - FormulaEditStart");
-            if (_argumentsToolTip == null)
+            if (_formulaEditWindow != IntPtr.Zero && _argumentsToolTip == null)
                 _argumentsToolTip = new ToolTipForm(_formulaEditWindow);
         }
 
         // Runs on the main thread
         void FormulaEditEnd()
         {
             Debug.Print($"IntelliSenseDisplay - FormulaEditEnd");
-            _argumentsToolTip.Hide();
-            //_argumentsToolTip.Dispose();
-            //_argumentsToolTip = null;
+            //_argumentsToolTip.Hide();
+            _argumentsToolTip.Dispose();
+            _argumentsToolTip = null;
         }
 
         // Runs on the main thread
@@ -238,9 +253,12 @@ void FormulaEditTextChange(string formulaPrefix, Rect editWindowBounds, Rect exc
             }
 
             // All other paths, we just clear the box
-            _argumentsToolTip.Hide();
-            //_argumentsToolTip.Dispose();
-            //_argumentsToolTip = null;
+            if (_argumentsToolTip != null)
+            {
+                //_argumentsToolTip.Hide();
+                _argumentsToolTip.Dispose();
+                _argumentsToolTip = null;
+            }
         }
 
 

Source/ExcelDna.IntelliSense/ToolTipForm.cs

@@ -24,6 +24,8 @@ public ToolTipForm(IntPtr hwndOwner)
             Debug.Assert(hwndOwner != IntPtr.Zero);
             InitializeComponent();
             _owner = new Win32Window(hwndOwner);
+            //Win32Helper.SetParent(this.Handle, hwndOwner);
+
             // _owner = new NativeWindow();
             // _owner.AssignHandle(hwndParent); (...with ReleaseHandle in Dispose)
             Debug.Print($"Created ToolTipForm with owner {hwndOwner}");
@@ -92,6 +94,7 @@ public IntPtr OwnerHandle
                 if (_owner == null || _owner.Handle != value)
                 {
                     _owner = new Win32Window(value);
+                    //Win32Helper.SetParent(this.Handle, value);
                     if (Visible)
                     {
                         // Rather just change Owner....

Source/ExcelDna.IntelliSense/UIMonitor.cs

@@ -508,7 +508,7 @@ UIState ReadCurrentState()
             {
                 return new UIState.FormulaEdit
                 {
-                    FormulaEditWindow = _formulaEditWatcher.FormulaBarWindow,
+                    FormulaEditWindow = _formulaEditWatcher.FormulaEditWindow,
                     EditWindowBounds = _formulaEditWatcher.EditWindowBounds,
                     FormulaPrefix = _formulaEditWatcher.CurrentPrefix ?? "", // TODO: Deal with nulls here... (we're not in FormulaEdit state anymore)
                 };