Improving mouse propagation in 3D3

Author: larsbrubaker

GuiAutomation/AggInputMethods.cs

@@ -363,6 +363,21 @@ private GuiWidget FindRootSystemWindow()
 
 		private static readonly uint ModifierKeyMask = ModifierKeyList.Aggregate(0u, (acc, v) => acc | (uint)v);
 
+		private static void TrySetModifierKeys(IPlatformWindow platformWindow, Keys mods)
+		{
+			var type = platformWindow.GetType();
+			while (type != null)
+			{
+				var method = type.GetMethod("SetModifierKeys", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
+				if (method != null)
+				{
+					method.Invoke(platformWindow, new object[] { mods });
+					return;
+				}
+				type = type.BaseType;
+			}
+		}
+
 		public void PressModifierKeys(Keys modifierKeys)
 		{
 			var mods = (uint)modifierKeys & ModifierKeyMask;
@@ -402,12 +417,7 @@ void setModifiers(uint m, Keys key)
 			setModifiers(mods, Keys.Control);
 			setModifiers(mods, Keys.Alt);
 
-			var platformWindowType = systemWindow.PlatformWindow.GetType();
-			if (platformWindowType.Name == "OpenGLSystemWindow")
-			{
-				var methodInfo = platformWindowType.GetMethod("SetModifierKeys", BindingFlags.Instance | BindingFlags.NonPublic);
-				methodInfo.Invoke(systemWindow.PlatformWindow, new object[] { (Keys)mods });
-			}
+			TrySetModifierKeys(systemWindow.PlatformWindow, (Keys)mods);
 
 			systemWindow.OnKeyDown(keyDownEvent);
 		}
@@ -451,12 +461,7 @@ void unsetModifier(uint m, Keys key)
 			unsetModifier(mods, Keys.Control);
 			unsetModifier(mods, Keys.Alt);
 
-			var platformWindowType = systemWindow.PlatformWindow.GetType();
-			if (platformWindowType.Name == "OpenGLSystemWindow")
-			{
-				var methodInfo = platformWindowType.GetMethod("SetModifierKeys", BindingFlags.Instance | BindingFlags.NonPublic);
-				methodInfo.Invoke(systemWindow.PlatformWindow, new object[] { (Keys)mods });
-			}
+			TrySetModifierKeys(systemWindow.PlatformWindow, (Keys)mods);
 
 			systemWindow.OnKeyUp(keyUpEvent);
 		}

PlatformWin32/win32/WinformsSystemWindow.cs

@@ -334,7 +334,26 @@ protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
 
 		public ISystemWindowProvider WindowProvider { get; set; }
 
-		public new virtual Keys ModifierKeys => (Keys)Control.ModifierKeys;
+		private Keys overrideModifierKeys = Keys.None;
+		private bool modifiersOverridden = false;
+
+		internal void SetModifierKeys(Keys modifiers)
+		{
+			overrideModifierKeys = modifiers;
+			modifiersOverridden = true;
+		}
+
+		public new virtual Keys ModifierKeys
+		{
+			get
+			{
+				if (modifiersOverridden)
+				{
+					return overrideModifierKeys;
+				}
+				return (Keys)Control.ModifierKeys;
+			}
+		}
 
 		// TODO: Why is this member named Caption instead of Title?
 		public string Caption