Improve PopupList display performance.

govert · govert · commit 39f878ccb3ce · 2016-05-13T14:00:41.000+02:00
IntelliSenseServer v 0.0.5
diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs b/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs
@@ -309,7 +309,7 @@ void FunctionListHide()
         // Runs on the main thread
         void FunctionListSelectedItemChange(string selectedItemText, Rect selectedItemBounds)
         {
-            Debug.Print($"IntelliSenseDisplay - PopupListSelectedItemChanged - New text - {selectedItemText}, Thread {Thread.CurrentThread.ManagedThreadId}");
+            Logger.Display.Verbose($"IntelliSenseDisplay - PopupListSelectedItemChanged - New text - {selectedItemText}, Thread {Thread.CurrentThread.ManagedThreadId}");
 
             IntelliSenseFunctionInfo functionInfo;
             if (_functionInfoMap.TryGetValue(selectedItemText, out functionInfo))
diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs b/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs
@@ -47,7 +47,7 @@ namespace ExcelDna.IntelliSense
     // REMEMBER: COM events are not necessarily safe macro contexts.
     public static class IntelliSenseServer
     {
-        const string ServerVersion = "0.0.4";  // TODO: Define and manage this somewhere else
+        const string ServerVersion = "0.0.5";  // TODO: Define and manage this somewhere else
 
         // NOTE: Do not change these constants in custom versions. 
         //       They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.
@@ -121,7 +121,7 @@ private static void CurrentDomain_ProcessExit(object sender, EventArgs e)
             {
                 Deactivate();
             }
-            Logger.Initialization.Verbose("IntelliSenseServer PrcessExit End");
+            Logger.Initialization.Verbose("IntelliSenseServer ProcessExit End");
             
         }
 
diff --git a/Source/ExcelDna.IntelliSense/ToolTipForm.cs b/Source/ExcelDna.IntelliSense/ToolTipForm.cs
@@ -18,6 +18,8 @@ class ToolTipForm  : Form
         ToolTip tipDna;
         System.ComponentModel.IContainer components;
         Win32Window _owner;
+        int _left;
+        int _top;
 
         public ToolTipForm(IntPtr hwndOwner)
         {
@@ -71,15 +73,15 @@ public void ShowToolTip(FormattedText text, int left, int top)
                 Debug.Print($"Invalidating ToolTipForm: {_text.ToString()}");
                 Invalidate();
             }
-            Left = left;
-            Top = top;
+            _left = left;
+            _top = top;
         }
 
         public void MoveToolTip(int left, int top)
         {
             Invalidate();
-            Left = left;
-            Top = top;
+            _left = left;
+            _top = top;
         }
 
         public IntPtr OwnerHandle
@@ -194,7 +196,8 @@ protected override void OnPaint(PaintEventArgs e)
                 }
             }
 
-            Size = new Size(lineWidths.Max() + widthPadding, totalHeight + heightPadding);
+            SetBounds(_left, _top, lineWidths.Max() + widthPadding, totalHeight + heightPadding);
+//            Size = new Size(lineWidths.Max() + widthPadding, totalHeight + heightPadding);
         }
 
         void DrawString(Graphics g, Brush brush, ref Rectangle rect, out Size used,
diff --git a/Source/ExcelDna.IntelliSense/UIMonitor/FormulaEditWatcher.cs b/Source/ExcelDna.IntelliSense/UIMonitor/FormulaEditWatcher.cs
@@ -430,35 +430,24 @@ void OnStateChanged(StateChangeEventArgs stateChangeEventArgs)
 
         public void Dispose()
         {
-            Logger.WindowWatcher.Verbose("FormulaEdit Disposing");
+            Logger.WindowWatcher.Verbose("FormulaEdit Dispose Begin");
             XlCall.ShutdownStarted();
 
             // Not sure we need this:
             _windowWatcher.FormulaBarWindowChanged -= _windowWatcher_FormulaBarWindowChanged;
             _windowWatcher.InCellEditWindowChanged -= _windowWatcher_InCellEditWindowChanged;
 //            _windowWatcher.MainWindowChanged -= _windowWatcher_MainWindowChanged;
 
-            _formulaPollingTimer?.Dispose();
-            _formulaPollingTimer = null;
-
+            // Forcing cleanup on the automation thread - not sure we need to ....
             _syncContextAuto.Send(delegate 
             {
-                if (_formulaBar != null)
-                {
-                    UninstallTextChangeMonitor(_formulaBar);
-                    _formulaBar = null;
-                }
-                if (_inCellEdit != null)
-                {
-                    UninstallTextChangeMonitor(_inCellEdit);
-                    _inCellEdit = null;
-                }
-                //if (_mainWindow != null)
-                //{
-                //    Automation.RemoveAutomationPropertyChangedEventHandler(_mainWindow, LocationChanged);
-                //    _mainWindow = null;
-                //}
+                _enableFormulaPolling = false;
+                _formulaPollingTimer?.Dispose();
+                _formulaPollingTimer = null;
+                _formulaBar = null;
+                _inCellEdit = null;
             }, null);
+            Logger.WindowWatcher.Verbose("FormulaEdit Dispose End");
         }
     }
 }
diff --git a/Source/ExcelDna.IntelliSense/UIMonitor/PopupListWatcher.cs b/Source/ExcelDna.IntelliSense/UIMonitor/PopupListWatcher.cs
@@ -365,7 +365,7 @@ void OnSelectedItemChanged()
 
         public void Dispose()
         {
-            Logger.WindowWatcher.Info($"PopupList Dispose");
+            Logger.WindowWatcher.Info($"PopupList Dispose Begin");
             _windowWatcher.PopupListWindowChanged -= _windowWatcher_PopupListWindowChanged;
             _windowWatcher = null;
 
@@ -374,11 +374,12 @@ public void Dispose()
                 Debug.Print("Disposing PopupListWatcher - In Automation context");
                 if (_popupList != null)
                 {
-                    Automation.RemoveAutomationEventHandler(SelectionItemPattern.ElementSelectedEvent, _popupList, PopupListElementSelectedHandler);
-                    Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);
+                    //Automation.RemoveAutomationEventHandler(SelectionItemPattern.ElementSelectedEvent, _popupList, PopupListElementSelectedHandler);
+                    //Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);
                     _popupList = null;
                 }
             }, null);
+            Logger.WindowWatcher.Info($"PopupList Dispose End");
         }
     }
 }
diff --git a/Source/ExcelDna.IntelliSense/UIMonitor/UIMonitor.cs b/Source/ExcelDna.IntelliSense/UIMonitor/UIMonitor.cs
@@ -621,12 +621,16 @@ void RaiseStateUpdates(object updates)
 
         public void Dispose()
         {
+            Logger.Monitor.Info($"UIMonitor Dispose Begin");
+
             if (_syncContextAuto == null)
                 return;
 
             // Send is not supported on _syncContextAuto
             _syncContextAuto.Send(delegate
                 {
+                    // Remove all event handlers ASAP
+                    Automation.RemoveAllEventHandlers();
                     if (_windowWatcher != null)
                     {
 //                        _windowWatcher.MainWindowChanged -= _windowWatcher_MainWindowChanged;
@@ -646,8 +650,6 @@ public void Dispose()
                         _popupListWatcher.Dispose();
                         _popupListWatcher = null;
                     }
-                    // Try to clean up any stray event handlers too...
-                    Automation.RemoveAllEventHandlers();
 
                 }, null);
 
@@ -658,7 +660,7 @@ public void Dispose()
                 _syncContextAuto.Complete();
                 _syncContextAuto = null;
             }, null);
-
+            Logger.Monitor.Info($"UIMonitor Dispose End");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ void FunctionListHide()`
`309`	`309`	`// Runs on the main thread`
`310`	`310`	`void FunctionListSelectedItemChange(string selectedItemText, Rect selectedItemBounds)`
`311`	`311`	`{`
`312`		`- Debug.Print($"IntelliSenseDisplay - PopupListSelectedItemChanged - New text - {selectedItemText}, Thread {Thread.CurrentThread.ManagedThreadId}");`
	`312`	`+ Logger.Display.Verbose($"IntelliSenseDisplay - PopupListSelectedItemChanged - New text - {selectedItemText}, Thread {Thread.CurrentThread.ManagedThreadId}");`
`313`	`313`
`314`	`314`	`IntelliSenseFunctionInfo functionInfo;`
`315`	`315`	`if (_functionInfoMap.TryGetValue(selectedItemText, out functionInfo))`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace ExcelDna.IntelliSense`
`47`	`47`	`// REMEMBER: COM events are not necessarily safe macro contexts.`
`48`	`48`	`public static class IntelliSenseServer`
`49`	`49`	`{`
`50`		`- const string ServerVersion = "0.0.4"; // TODO: Define and manage this somewhere else`
	`50`	`+ const string ServerVersion = "0.0.5"; // TODO: Define and manage this somewhere else`
`51`	`51`
`52`	`52`	`// NOTE: Do not change these constants in custom versions.`
`53`	`53`	`// They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.`
`@@ -121,7 +121,7 @@ private static void CurrentDomain_ProcessExit(object sender, EventArgs e)`
`121`	`121`	`{`
`122`	`122`	`Deactivate();`
`123`	`123`	`}`
`124`		`- Logger.Initialization.Verbose("IntelliSenseServer PrcessExit End");`
	`124`	`+ Logger.Initialization.Verbose("IntelliSenseServer ProcessExit End");`
`125`	`125`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ class ToolTipForm : Form`
`18`	`18`	`ToolTip tipDna;`
`19`	`19`	`System.ComponentModel.IContainer components;`
`20`	`20`	`Win32Window _owner;`
	`21`	`+ int _left;`
	`22`	`+ int _top;`
`21`	`23`
`22`	`24`	`public ToolTipForm(IntPtr hwndOwner)`
`23`	`25`	`{`
`@@ -71,15 +73,15 @@ public void ShowToolTip(FormattedText text, int left, int top)`
`71`	`73`	`Debug.Print($"Invalidating ToolTipForm: {_text.ToString()}");`
`72`	`74`	`Invalidate();`
`73`	`75`	`}`
`74`		`- Left = left;`
`75`		`- Top = top;`
	`76`	`+ _left = left;`
	`77`	`+ _top = top;`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`public void MoveToolTip(int left, int top)`
`79`	`81`	`{`
`80`	`82`	`Invalidate();`
`81`		`- Left = left;`
`82`		`- Top = top;`
	`83`	`+ _left = left;`
	`84`	`+ _top = top;`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`public IntPtr OwnerHandle`
`@@ -194,7 +196,8 @@ protected override void OnPaint(PaintEventArgs e)`
`194`	`196`	`}`
`195`	`197`	`}`
`196`	`198`
`197`		`- Size = new Size(lineWidths.Max() + widthPadding, totalHeight + heightPadding);`
	`199`	`+ SetBounds(_left, _top, lineWidths.Max() + widthPadding, totalHeight + heightPadding);`
	`200`	`+// Size = new Size(lineWidths.Max() + widthPadding, totalHeight + heightPadding);`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`void DrawString(Graphics g, Brush brush, ref Rectangle rect, out Size used,`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ void OnSelectedItemChanged()`
`365`	`365`
`366`	`366`	`public void Dispose()`
`367`	`367`	`{`
`368`		`- Logger.WindowWatcher.Info($"PopupList Dispose");`
	`368`	`+ Logger.WindowWatcher.Info($"PopupList Dispose Begin");`
`369`	`369`	`_windowWatcher.PopupListWindowChanged -= _windowWatcher_PopupListWindowChanged;`
`370`	`370`	`_windowWatcher = null;`
`371`	`371`
`@@ -374,11 +374,12 @@ public void Dispose()`
`374`	`374`	`Debug.Print("Disposing PopupListWatcher - In Automation context");`
`375`	`375`	`if (_popupList != null)`
`376`	`376`	`{`
`377`		`- Automation.RemoveAutomationEventHandler(SelectionItemPattern.ElementSelectedEvent, _popupList, PopupListElementSelectedHandler);`
`378`		`- Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);`
	`377`	`+ //Automation.RemoveAutomationEventHandler(SelectionItemPattern.ElementSelectedEvent, _popupList, PopupListElementSelectedHandler);`
	`378`	`+ //Automation.RemoveAutomationPropertyChangedEventHandler(_popupList, PopupListBoundsChanged);`
`379`	`379`	`_popupList = null;`
`380`	`380`	`}`
`381`	`381`	`}, null);`
	`382`	`+ Logger.WindowWatcher.Info($"PopupList Dispose End");`
`382`	`383`	`}`
`383`	`384`	`}`
`384`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -621,12 +621,16 @@ void RaiseStateUpdates(object updates)`
`621`	`621`
`622`	`622`	`public void Dispose()`
`623`	`623`	`{`
	`624`	`+ Logger.Monitor.Info($"UIMonitor Dispose Begin");`
	`625`	`+`
`624`	`626`	`if (_syncContextAuto == null)`
`625`	`627`	`return;`
`626`	`628`
`627`	`629`	`// Send is not supported on _syncContextAuto`
`628`	`630`	`_syncContextAuto.Send(delegate`
`629`	`631`	`{`
	`632`	`+ // Remove all event handlers ASAP`
	`633`	`+ Automation.RemoveAllEventHandlers();`
`630`	`634`	`if (_windowWatcher != null)`
`631`	`635`	`{`
`632`	`636`	`// _windowWatcher.MainWindowChanged -= _windowWatcher_MainWindowChanged;`
`@@ -646,8 +650,6 @@ public void Dispose()`
`646`	`650`	`_popupListWatcher.Dispose();`
`647`	`651`	`_popupListWatcher = null;`
`648`	`652`	`}`
`649`		`- // Try to clean up any stray event handlers too...`
`650`		`- Automation.RemoveAllEventHandlers();`
`651`	`653`
`652`	`654`	`}, null);`
`653`	`655`
`@@ -658,7 +660,7 @@ public void Dispose()`
`658`	`660`	`_syncContextAuto.Complete();`
`659`	`661`	`_syncContextAuto = null;`
`660`	`662`	`}, null);`
`661`		`-`
	`663`	`+ Logger.Monitor.Info($"UIMonitor Dispose End");`
`662`	`664`	`}`
`663`	`665`	`}`
`664`	`666`	`}`