Avoid re-focusing if control already has focus (#495)

Re-focusing interferes with certain operations such as resizing windows in Remote Desktop
GoogleCloudPlatform · May 14, 2021 · 5410a0a · 5410a0a
1 parent 2a6f895
commit 5410a0a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sources/Google.Solutions.IapDesktop.Extensions.Shell/Views/RemoteDesktop/MsRdpClient.cs b/sources/Google.Solutions.IapDesktop.Extensions.Shell/Views/RemoteDesktop/MsRdpClient.cs
@@ -42,7 +42,11 @@ protected override void WndProc(ref Message m)
             //
             // Cf. https://www.codeproject.com/Tips/109917/Fix-the-focus-issue-on-RDP-Client-from-the-AxInter
             //
-            if (m.Msg == WM_MOUSEACTIVATE)
+            // NB. Only do this when the control does not have focus yet, 
+            // otherwise we're interfering with operations such as dragging 
+            // or resizing windows.
+            //
+            if (!this.ContainsFocus && m.Msg == WM_MOUSEACTIVATE)
             {
                 this.Focus();
             }