Skip to content

Commit eb592a1

Browse files
committed
Also stop activating panes on setting the selection in VB6
1 parent b01f450 commit eb592a1

File tree

2 files changed

+2
-35
lines changed

2 files changed

+2
-35
lines changed

Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodePane.cs

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
3-
using Rubberduck.VBEditor.WindowsApi;
1+
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
42
using VB = Microsoft.Vbe.Interop.VB6;
53

64
// ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities
@@ -90,35 +88,6 @@ private void SetSelection(int startLine, int startColumn, int endLine, int endCo
9088
return;
9189
}
9290
Target.SetSelection(startLine, startColumn, endLine, endColumn);
93-
ForceFocus();
94-
}
95-
96-
private void ForceFocus()
97-
{
98-
if (IsWrappingNullReference)
99-
{
100-
return;
101-
}
102-
103-
Show();
104-
105-
using (var vbe = VBE)
106-
using (var mainWindow = vbe.MainWindow)
107-
using (var window = Window)
108-
{
109-
var mainWindowHandle = mainWindow.Handle();
110-
var handle = mainWindow.Handle().FindChildWindow(window.Caption);
111-
112-
if (handle != IntPtr.Zero)
113-
{
114-
NativeMethods.ActivateWindow(handle, mainWindowHandle);
115-
}
116-
else
117-
{
118-
_logger.Debug(
119-
"CodePane.ForceFocus() failed to get a handle on the MainWindow.");
120-
}
121-
}
12291
}
12392

12493
public void Show()

Rubberduck.VBEditor.VBA/SafeComWrappers/VB/CodePane.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
3-
using Rubberduck.VBEditor.WindowsApi;
1+
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
42
using VB = Microsoft.Vbe.Interop;
53

64
// ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities

0 commit comments

Comments
 (0)