From b578718355ed129de9872182b5ff4467467bf6a5 Mon Sep 17 00:00:00 2001 From: Sour Date: Sun, 25 Mar 2018 16:34:12 -0400 Subject: [PATCH] UI: Fixed keyboard focus issue with menus & toolbars --- GUI.NET/Controls/ctrlMesenMenuStrip.cs | 2 +- GUI.NET/Controls/ctrlMesenToolStrip.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GUI.NET/Controls/ctrlMesenMenuStrip.cs b/GUI.NET/Controls/ctrlMesenMenuStrip.cs index 2d4d29ec..78836023 100644 --- a/GUI.NET/Controls/ctrlMesenMenuStrip.cs +++ b/GUI.NET/Controls/ctrlMesenMenuStrip.cs @@ -13,7 +13,7 @@ namespace Mesen.GUI.Controls protected override void WndProc(ref Message m) { if(m.Msg == WM_MOUSEACTIVATE && this.CanFocus && !this.Focused) { - this.Focus(); + this.FindForm()?.Focus(); } base.WndProc(ref m); } diff --git a/GUI.NET/Controls/ctrlMesenToolStrip.cs b/GUI.NET/Controls/ctrlMesenToolStrip.cs index ea2397ee..4a76f2f6 100644 --- a/GUI.NET/Controls/ctrlMesenToolStrip.cs +++ b/GUI.NET/Controls/ctrlMesenToolStrip.cs @@ -13,7 +13,7 @@ namespace Mesen.GUI.Controls protected override void WndProc(ref Message m) { if(m.Msg == WM_MOUSEACTIVATE && this.CanFocus && !this.Focused) { - this.Focus(); + this.FindForm()?.Focus(); } base.WndProc(ref m); }