Fixes for focus events to catch designer windows. Still needs work in App.cs

Author: comintern

RetailCoder.VBE/App.cs

@@ -94,7 +94,15 @@ private void _vbe_FocusChanged(object sender, WindowChangedEventArgs e)
         {
             if (e.EventType == WindowChangedEventArgs.FocusType.GotFocus)
             {
-                RefreshSelection(e.Window);
+                switch (e.Window.Type)
+                {
+                    case WindowKind.Designer:
+                        RefreshSelection(e.Window);
+                        break;
+                    case WindowKind.CodeWindow:
+                        RefreshSelection(e.CodePane);
+                        break;
+                }              
             }          
         }
 

Rubberduck.VBEEditor/Events/VBEEvents.cs

@@ -92,7 +92,9 @@ private static void AttachWindow(IntPtr hwnd)
                 Debug.Assert(!TrackedWindows.ContainsKey(hwnd));
                 var window = GetWindowFromHwnd(hwnd);
                 if (window == null) return;
-                var source = window.Type == WindowKind.CodeWindow ? new CodePaneSubclass(hwnd) as IWindowEventProvider: new DesignerWindowSubclass(hwnd);
+                var source = window.Type == WindowKind.CodeWindow
+                    ? new CodePaneSubclass(hwnd, GetCodePaneFromHwnd(hwnd)) as IWindowEventProvider
+                    : new DesignerWindowSubclass(hwnd);
                 var info = new WindowInfo(hwnd, window, source);
                 source.FocusChange += FocusDispatcher;
                 TrackedWindows.Add(hwnd, info);

Rubberduck.VBEEditor/Events/WindowChangedEventArgs.cs

@@ -13,12 +13,14 @@ public enum FocusType
 
         public IntPtr Hwnd { get; private set; }
         public IWindow Window { get; private set; }
+        public ICodePane CodePane { get; private set; }
         public FocusType EventType { get; private set; }
 
-        public WindowChangedEventArgs(IntPtr hwnd, IWindow window, FocusType type)
+        public WindowChangedEventArgs(IntPtr hwnd, IWindow window, ICodePane pane, FocusType type)
         {
             Hwnd = hwnd;
             Window = window;
+            CodePane = pane;
             EventType = type;
         }
     }

Rubberduck.VBEEditor/WindowsApi/CodePaneSubclass.cs

@@ -1,10 +1,29 @@
 using System;
+using Rubberduck.VBEditor.Events;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.VBEditor.WindowsApi
 {
+    //Stub for code pane replacement.  :-)
     internal class CodePaneSubclass : FocusSource
     {
-        //Stub for code pane replacement.  :-)
-        internal CodePaneSubclass(IntPtr hwnd) : base(hwnd) { }
+        private readonly ICodePane _pane;
+
+        public ICodePane CodePane { get { return _pane; } }
+
+        internal CodePaneSubclass(IntPtr hwnd, ICodePane pane) : base(hwnd)
+        {
+            _pane = pane;
+        }
+
+        protected override void DispatchFocusEvent(WindowChangedEventArgs.FocusType type)
+        {
+            var window = VBEEvents.GetWindowInfoFromHwnd(Hwnd);
+            if (window == null)
+            {
+                return;
+            }
+            OnFocusChange(new WindowChangedEventArgs(window.Value.Hwnd, window.Value.Window, _pane, type));
+        }
     }
 }

Rubberduck.VBEEditor/WindowsApi/FocusSource.cs

@@ -9,28 +9,34 @@ internal abstract class FocusSource : SubclassingWindow, IWindowEventProvider
         protected FocusSource(IntPtr hwnd) : base(hwnd, hwnd) { }
 
         public event EventHandler<WindowChangedEventArgs> FocusChange;
-        private void OnFocusChange(WindowChangedEventArgs.FocusType type)
+        protected void OnFocusChange(WindowChangedEventArgs eventArgs)
         {
             if (FocusChange != null)
             {
-                var window = VBEEvents.GetWindowInfoFromHwnd(Hwnd);
-                if (window == null)
-                {
-                    return;
-                }
-                FocusChange.Invoke(this, new WindowChangedEventArgs(window.Value.Hwnd, window.Value.Window, type));
+                FocusChange.Invoke(this, eventArgs);
             }
-        } 
+        }
+
+        protected virtual void DispatchFocusEvent(WindowChangedEventArgs.FocusType type)
+        {
+            var window = VBEEvents.GetWindowInfoFromHwnd(Hwnd);
+            if (window == null)
+            {
+                return;
+            }
+            OnFocusChange(new WindowChangedEventArgs(Hwnd, window.Value.Window, null, type));
+        }
 
         public override int SubClassProc(IntPtr hWnd, IntPtr msg, IntPtr wParam, IntPtr lParam, IntPtr uIdSubclass, IntPtr dwRefData)
         {
             switch ((uint)msg)
             {
                 case (uint)WM.SETFOCUS:
-                    OnFocusChange(WindowChangedEventArgs.FocusType.GotFocus);
+
+                    DispatchFocusEvent(WindowChangedEventArgs.FocusType.GotFocus);
                     break;
                 case (uint)WM.KILLFOCUS:
-                    OnFocusChange(WindowChangedEventArgs.FocusType.LostFocus);
+                    DispatchFocusEvent(WindowChangedEventArgs.FocusType.LostFocus);
                     break;
             }
             return base.SubClassProc(hWnd, msg, wParam, lParam, uIdSubclass, dwRefData);