Skip to content

Commit 720dbf9

Browse files
committed
Fix PopupList tracking bug.
Update IntelliSenseServer version to 1.0.3
1 parent 4c69bca commit 720dbf9

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>ExcelDna.IntelliSense</id>
5-
<version>1.0.2</version>
5+
<version>1.0.3</version>
66
<title>Excel-DNA IntelliSense Extension</title>
77
<authors>Excel-DNA Contributors</authors>
88
<owners>Excel-DNA Contributors</owners>

Source/ExcelDna.IntelliSense.Host/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.2.*")]
36-
[assembly: AssemblyFileVersion("1.0.2.0")]
35+
[assembly: AssemblyVersion("1.0.3.*")]
36+
[assembly: AssemblyFileVersion("1.0.3.0")]

Source/ExcelDna.IntelliSense.Tools/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.2.*")]
36-
[assembly: AssemblyFileVersion("1.0.2.0")]
35+
[assembly: AssemblyVersion("1.0.3.*")]
36+
[assembly: AssemblyFileVersion("1.0.3.0")]

Source/ExcelDna.IntelliSense/IntelliSenseServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ExcelDna.IntelliSense
2828
// REMEMBER: COM events are not necessarily safe macro contexts.
2929
public static class IntelliSenseServer
3030
{
31-
const string ServerVersion = "1.0.2"; // TODO: Define and manage this somewhere else
31+
const string ServerVersion = "1.0.3"; // TODO: Define and manage this somewhere else
3232

3333
// NOTE: Do not change these constants in custom versions.
3434
// They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.

Source/ExcelDna.IntelliSense/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.2.*")]
36-
[assembly: AssemblyFileVersion("1.0.2.0")]
35+
[assembly: AssemblyVersion("1.0.3.*")]
36+
[assembly: AssemblyFileVersion("1.0.3.0")]

Source/ExcelDna.IntelliSense/UIMonitor/PopupListWatcher.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void _windowWatcher_PopupListWindowChanged(object sender, WindowWatcher.WindowCh
5555
break;
5656
case WindowWatcher.WindowChangedEventArgs.ChangeType.Show:
5757
Logger.WindowWatcher.Verbose($"PopupList window show");
58+
_hwndPopupList = e.WindowHandle; // We might have missed the Create
5859
IsVisible = true;
5960
if (_selectionChangeHook == null)
6061
{
@@ -124,7 +125,7 @@ void _selectionChangeHook_WinEventReceived(object sender, WinEventHook.WinEventA
124125

125126
void UpdateSelectedItem()
126127
{
127-
if (_hwndPopupList == null)
128+
if (_hwndPopupList == IntPtr.Zero)
128129
{
129130
Logger.WindowWatcher.Verbose($"PopupList UpdateSelectedItem ignored: PopupList is null");
130131
return;

0 commit comments

Comments
 (0)