Merge branch 'next' into FixTestMethodCommands

Author: Hosch250

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -173,12 +173,6 @@ public void Detach()
 
         private void hook_MessageReceived(object sender, HookEventArgs e)
         {
-            var active = User32.GetForegroundWindow();
-            if (active != _mainWindowHandle)
-            {
-                return;
-            }
-
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {
@@ -207,6 +201,16 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
                     case WM.SETFOCUS:
                         Attach();
                         break;
+                    case WM.RUBBERDUCK_CHILD_FOCUS:
+                        if (lParam == IntPtr.Zero)
+                        {
+                            Detach();
+                        }
+                        else
+                        {
+                            Attach();
+                        }
+                        return IntPtr.Zero;
                     case WM.NCACTIVATE:                   
                         if (wParam == IntPtr.Zero)
                         {
@@ -235,14 +239,11 @@ private bool HandleHotkeyMessage(IntPtr wParam)
             var processed = false;
             try
             {
-                if (User32.IsVbeWindowActive(_mainWindowHandle))
+                var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == wParam);
+                if (hook != null)
                 {
-                    var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == wParam);
-                    if (hook != null)
-                    {
-                        hook.OnMessageReceived();
-                        processed = true;
-                    }
+                    hook.OnMessageReceived();
+                    processed = true;
                 }
             }
             catch (Exception exception)

RetailCoder.VBE/Common/WinAPI/User32.cs

@@ -180,6 +180,9 @@ public static class User32
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern bool UnregisterDeviceNotification(IntPtr handle);
 
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        internal static extern IntPtr SendMessage(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);
+
         /// <summary>
         /// A helper function that returns <c>true</c> when the specified handle is that of the foreground window.
         /// </summary>

RetailCoder.VBE/Common/WinAPI/WM.cs

@@ -922,6 +922,11 @@ public enum WM : uint
         /// </summary>
         SYSTIMER = 0x118,
 
+        /// <summary>
+        /// Private message to signal focus set/lost for a DockableWindowHost. Set wParam to the DockableWindowHost hWnd, lParam to zero for lost focus, non-zero for gained focus.
+        /// </summary>
+        RUBBERDUCK_CHILD_FOCUS = USER + 0x0F00,
+
         /// <summary>
         /// The accessibility state has changed.
         /// </summary>

RetailCoder.VBE/UI/DockableToolwindowPresenter.cs

@@ -62,7 +62,7 @@ private Window CreateToolWindow(IDockableUserControl control)
 
             toolWindow.Visible = false; //hide it again
 
-            userControlHost.AddUserControl(control as UserControl);
+            userControlHost.AddUserControl(control as UserControl, new IntPtr(_vbe.MainWindow.HWnd));
             return toolWindow;
         }
 

RetailCoder.VBE/UI/DockableWindowHost.cs

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using Rubberduck.Common.WinAPI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.UI
@@ -40,10 +41,10 @@ private struct Rect
         private IntPtr _parentHandle;
         private SubClassingWindow _subClassingWindow;
 
-        internal void AddUserControl(UserControl control)
+        internal void AddUserControl(UserControl control, IntPtr vbeHwnd)
         {
             _parentHandle = GetParent(Handle);
-            _subClassingWindow = new SubClassingWindow(_parentHandle);
+            _subClassingWindow = new SubClassingWindow(_parentHandle, vbeHwnd);
             _subClassingWindow.CallBackEvent += OnCallBackEvent;
 
             if (control != null)
@@ -116,27 +117,35 @@ public class SubClassingWindow : NativeWindow
             public event SubClassingWindowEventHandler CallBackEvent;
             public delegate void SubClassingWindowEventHandler(object sender, SubClassingWindowEventArgs e);
 
+            private readonly IntPtr _vbeHwnd;
+
             private void OnCallBackEvent(SubClassingWindowEventArgs e)
             {
                 Debug.Assert(CallBackEvent != null, "CallBackEvent != null");
                 CallBackEvent(this, e);
             }
 
-            public SubClassingWindow(IntPtr handle)
+            public SubClassingWindow(IntPtr handle, IntPtr vbeHwnd)
             {
+                _vbeHwnd = vbeHwnd;
                 AssignHandle(handle);
             }
 
             protected override void WndProc(ref Message msg)
             {
-                const int wmSize = 0x5;
-
-                if (msg.Msg == wmSize)
+                switch ((uint)msg.Msg)
                 {
-                    var args = new SubClassingWindowEventArgs(msg);
-                    OnCallBackEvent(args);
+                    case (uint)WM.SIZE:
+                        var args = new SubClassingWindowEventArgs(msg);
+                        OnCallBackEvent(args);
+                        break;
+                    case (uint)WM.SETFOCUS:
+                        User32.SendMessage(_vbeHwnd, WM.RUBBERDUCK_CHILD_FOCUS, Handle, Handle);
+                        break;
+                    case (uint)WM.KILLFOCUS:
+                        User32.SendMessage(_vbeHwnd, WM.RUBBERDUCK_CHILD_FOCUS, Handle, IntPtr.Zero);
+                        break;
                 }
-
                 base.WndProc(ref msg);
             }