fix: Fix the resizing bug introduced by #648, see #797 for more details.

VShawn · VShawn · commit d3c0cba53885 · 2024-12-09T11:02:34.000+08:00
close #648, fix #797
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs
@@ -189,13 +189,12 @@ private void OnRdpClientLoginComplete(object? sender, EventArgs e)
             GridLoading.Visibility = Visibility.Collapsed;
             GridMessageBox.Visibility = Visibility.Collapsed;
             ParentWindowResize_StartWatch();
-            _resizeEndTimer?.Stop();
-            _resizeEndTimer?.Start();
-            Task.Factory.StartNew(() =>
-            {
-                Thread.Sleep(5000);
-                _resizeEndTimer?.Stop();
-            });
+            //_resizeEndTimer?.Start();
+            //Task.Factory.StartNew(() =>
+            //{
+            //    Thread.Sleep(5000);
+            //    _resizeEndTimer?.Stop();
+            //});
         }
 
 
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs
@@ -70,7 +70,7 @@ public sealed partial class AxMsRdpClient09Host : HostBase, IDisposable
         private int _retryCount = 0;
         private const int MAX_RETRY_COUNT = 20;
 
-        private readonly System.Timers.Timer _loginResizeTimer;
+        private readonly System.Timers.Timer _loginResizeTimer; // timer for login resize, to fix the issue that the rdp client size is not correct when login
         private DateTime _lastLoginTime = DateTime.MinValue;
 
 
@@ -835,9 +835,9 @@ private void WindowSizeChanged(object sender, SizeChangedEventArgs e)
                     _previousHeight = (uint)e.NewSize.Height;
                     Execute.OnUIThreadSync(() =>
                     {
+                        _loginResizeTimer.Stop();
                         _resizeEndTimer.Stop();
                         _resizeEndTimer.Start();
-                        _loginResizeTimer.Stop();
                     });
                 }
             }
@@ -902,7 +902,7 @@ private void ReSizeRdpToControlSize()
             {
                 while (true)
                 {
-                    // Window drag an drop resize only after mouse button release, 当拖动最大化的窗口时，需检测鼠标按键释放后再调整分辨率，详见：https://github.com/1Remote/1Remote/issues/553
+                    // Window drag and drop resize only after mouse button release, 当拖动最大化的窗口时，需检测鼠标按键释放后再调整分辨率，详见：https://github.com/1Remote/1Remote/issues/553
                     var isPressed = false;
                     Execute.OnUIThreadSync(() => { isPressed = Mouse.LeftButton == MouseButtonState.Pressed; });
                     if (!isPressed)
diff --git a/Ui/View/Host/TabWindowView.xaml_timer.cs b/Ui/View/Host/TabWindowView.xaml_timer.cs
@@ -89,7 +89,12 @@ private void RunForIntegrate()
             _lastActivatedWindowHandle = nowActivatedWindowHandle;
         }
 
-
+		/****
+         * THE PURPOSE OF THIS FUNCTION IS TO:
+         * - LET YOUR LOCAL DESKTOP WINDOW GET FOCUS WHEN YOU MOVE THE CURSOR OUT OF THE RDP WINDOW
+         * - LET THE RDP WINDOW GET FOCUS WHEN YOU MOVE THE CURSOR INTO THE RDP WINDOW
+         * - CAUTION: PAY ATTENTION TO THE RESIZE OF THE RDP WINDOW, IT MAY CAUSE THE CURSOR TO MOVE OUT OF THE RDP WINDOW, SO WE NEED TO CHECK IF THE LEFT MOUSE BUTTON IS PRESSED OR NOT
+        ***/
         #region RunForRdp
 
         [StructLayout(LayoutKind.Sequential)]
@@ -129,32 +134,45 @@ private static bool IsMouseInside(Window window)
         }
 
 
-        private int _rdpStage = 0; // 0 - not connected, 1 - RDP got focus, 2 - RDP lost focus desk got focus(focus can rollback to RDP), 3 - RDP lost focus desk lost focus (focus can not rollback to RDP)
+        private int _rdpStage = 0; // flag: 0 - not connected, 1 - RDP got focus, 2 - RDP lost focus desk got focus(focus can rollback to RDP), 3 - RDP lost focus desk lost focus (focus can cannot rollback to RDP)
+
         private void RunForRdp()
         {
             if (Vm?.SelectedItem?.Content?.ProtocolServer.Protocol != RDP.ProtocolName)
                 return;
             if (Vm?.SelectedItem?.Content?.Status != ProtocolHosts.ProtocolHostStatus.Connected)
                 return;
 
+			// Fix the resizing bug introduced by #648, see https://github.com/1Remote/1Remote/issues/797 for more details
+			bool isMousePressed = System.Windows.Forms.Control.MouseButtons == MouseButtons.Left
+								  || System.Windows.Forms.Control.MouseButtons == MouseButtons.Right
+								  || System.Windows.Forms.Control.MouseButtons == MouseButtons.Middle;
+			if (isMousePressed)
+			{
+#if DEBUG
+				SimpleLogHelper.Debug("Tab focus: Mouse is pressed, do nothing");
+#endif
+				return;
+			}
+
             var nowActivatedWindowHandle = GetForegroundWindow();
             var desktopHandle = GetDesktopWindow();
 
 #if DEBUG
-            SimpleLogHelper.Debug($"tabHwnd = {_myHandle}, nowActivatedWindowHandle = {nowActivatedWindowHandle}, desktopHandle = {desktopHandle}");
+            SimpleLogHelper.Debug($"Tab focus: tabHwnd = {_myHandle}, nowActivatedWindowHandle = {nowActivatedWindowHandle}, desktopHandle = {desktopHandle}");
 #endif
 
             bool isMouseInside = IsMouseInside(this);
 
             if (_rdpStage == 1 && !isMouseInside)
             {
-                // 1 - RDP got focus  AND mouse is not inside the tab window, then switch focus to desktop, user input will not be sent to RDP
+                // 1 - RDP has focus AND mouse is not inside the tab window, then switch focus to desktop, user input will not be sent to RDP
                 _rdpStage = 2;
                 SetForegroundWindow(desktopHandle);
             }
             else if (_rdpStage == 2)
             {
-                // if focus to other window, then stage = 3
+                // if focus is on another window, then stage = 3
                 if (nowActivatedWindowHandle != desktopHandle)
                 {
                     _rdpStage = 3;
@@ -168,14 +186,14 @@ private void RunForRdp()
             }
             else if (_rdpStage == 3)
             {
-                // 3 - neither RDP nor local desk lost focus, can not rollback to RDP, do nothing
+                // 3 - neither RDP nor local desktop has focus, cannot rollback to RDP, do nothing
             }
 
             if (_rdpStage != 1 && isMouseInside && _myHandle == nowActivatedWindowHandle)
             {
                 _rdpStage = 1;
             }
-        } 
+        }
         #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public sealed partial class AxMsRdpClient09Host : HostBase, IDisposable`
`70`	`70`	`private int _retryCount = 0;`
`71`	`71`	`private const int MAX_RETRY_COUNT = 20;`
`72`	`72`
`73`		`- private readonly System.Timers.Timer _loginResizeTimer;`
	`73`	`+ private readonly System.Timers.Timer _loginResizeTimer; // timer for login resize, to fix the issue that the rdp client size is not correct when login`
`74`	`74`	`private DateTime _lastLoginTime = DateTime.MinValue;`
`75`	`75`
`76`	`76`
`@@ -835,9 +835,9 @@ private void WindowSizeChanged(object sender, SizeChangedEventArgs e)`
`835`	`835`	`_previousHeight = (uint)e.NewSize.Height;`
`836`	`836`	`Execute.OnUIThreadSync(() =>`
`837`	`837`	`{`
	`838`	`+ _loginResizeTimer.Stop();`
`838`	`839`	`_resizeEndTimer.Stop();`
`839`	`840`	`_resizeEndTimer.Start();`
`840`		`- _loginResizeTimer.Stop();`
`841`	`841`	`});`
`842`	`842`	`}`
`843`	`843`	`}`
`@@ -902,7 +902,7 @@ private void ReSizeRdpToControlSize()`
`902`	`902`	`{`
`903`	`903`	`while (true)`
`904`	`904`	`{`
`905`		`- // Window drag an drop resize only after mouse button release, 当拖动最大化的窗口时，需检测鼠标按键释放后再调整分辨率，详见：https://github.com/1Remote/1Remote/issues/553`
	`905`	`+ // Window drag and drop resize only after mouse button release, 当拖动最大化的窗口时，需检测鼠标按键释放后再调整分辨率，详见：https://github.com/1Remote/1Remote/issues/553`
`906`	`906`	`var isPressed = false;`
`907`	`907`	`Execute.OnUIThreadSync(() => { isPressed = Mouse.LeftButton == MouseButtonState.Pressed; });`
`908`	`908`	`if (!isPressed)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,12 @@ private void RunForIntegrate()`
`89`	`89`	`_lastActivatedWindowHandle = nowActivatedWindowHandle;`
`90`	`90`	`}`
`91`	`91`
`92`		`-`
	`92`	`+ /****`
	`93`	`+ * THE PURPOSE OF THIS FUNCTION IS TO:`
	`94`	`+ * - LET YOUR LOCAL DESKTOP WINDOW GET FOCUS WHEN YOU MOVE THE CURSOR OUT OF THE RDP WINDOW`
	`95`	`+ * - LET THE RDP WINDOW GET FOCUS WHEN YOU MOVE THE CURSOR INTO THE RDP WINDOW`
	`96`	`+ * - CAUTION: PAY ATTENTION TO THE RESIZE OF THE RDP WINDOW, IT MAY CAUSE THE CURSOR TO MOVE OUT OF THE RDP WINDOW, SO WE NEED TO CHECK IF THE LEFT MOUSE BUTTON IS PRESSED OR NOT`
	`97`	`+ ***/`
`93`	`98`	`#region RunForRdp`
`94`	`99`
`95`	`100`	`[StructLayout(LayoutKind.Sequential)]`
`@@ -129,32 +134,45 @@ private static bool IsMouseInside(Window window)`
`129`	`134`	`}`
`130`	`135`
`131`	`136`
`132`		`- private int _rdpStage = 0; // 0 - not connected, 1 - RDP got focus, 2 - RDP lost focus desk got focus(focus can rollback to RDP), 3 - RDP lost focus desk lost focus (focus can not rollback to RDP)`
	`137`	`+ private int _rdpStage = 0; // flag: 0 - not connected, 1 - RDP got focus, 2 - RDP lost focus desk got focus(focus can rollback to RDP), 3 - RDP lost focus desk lost focus (focus can cannot rollback to RDP)`
	`138`	`+`
`133`	`139`	`private void RunForRdp()`
`134`	`140`	`{`
`135`	`141`	`if (Vm?.SelectedItem?.Content?.ProtocolServer.Protocol != RDP.ProtocolName)`
`136`	`142`	`return;`
`137`	`143`	`if (Vm?.SelectedItem?.Content?.Status != ProtocolHosts.ProtocolHostStatus.Connected)`
`138`	`144`	`return;`
`139`	`145`
	`146`	`+ // Fix the resizing bug introduced by #648, see https://github.com/1Remote/1Remote/issues/797 for more details`
	`147`	`+ bool isMousePressed = System.Windows.Forms.Control.MouseButtons == MouseButtons.Left`
	`148`	`+ \|\| System.Windows.Forms.Control.MouseButtons == MouseButtons.Right`
	`149`	`+ \|\| System.Windows.Forms.Control.MouseButtons == MouseButtons.Middle;`
	`150`	`+ if (isMousePressed)`
	`151`	`+ {`
	`152`	`+#if DEBUG`
	`153`	`+ SimpleLogHelper.Debug("Tab focus: Mouse is pressed, do nothing");`
	`154`	`+#endif`
	`155`	`+ return;`
	`156`	`+ }`
	`157`	`+`
`140`	`158`	`var nowActivatedWindowHandle = GetForegroundWindow();`
`141`	`159`	`var desktopHandle = GetDesktopWindow();`
`142`	`160`
`143`	`161`	`#if DEBUG`
`144`		`- SimpleLogHelper.Debug($"tabHwnd = {_myHandle}, nowActivatedWindowHandle = {nowActivatedWindowHandle}, desktopHandle = {desktopHandle}");`
	`162`	`+ SimpleLogHelper.Debug($"Tab focus: tabHwnd = {_myHandle}, nowActivatedWindowHandle = {nowActivatedWindowHandle}, desktopHandle = {desktopHandle}");`
`145`	`163`	`#endif`
`146`	`164`
`147`	`165`	`bool isMouseInside = IsMouseInside(this);`
`148`	`166`
`149`	`167`	`if (_rdpStage == 1 && !isMouseInside)`
`150`	`168`	`{`
`151`		`- // 1 - RDP got focus AND mouse is not inside the tab window, then switch focus to desktop, user input will not be sent to RDP`
	`169`	`+ // 1 - RDP has focus AND mouse is not inside the tab window, then switch focus to desktop, user input will not be sent to RDP`
`152`	`170`	`_rdpStage = 2;`
`153`	`171`	`SetForegroundWindow(desktopHandle);`
`154`	`172`	`}`
`155`	`173`	`else if (_rdpStage == 2)`
`156`	`174`	`{`
`157`		`- // if focus to other window, then stage = 3`
	`175`	`+ // if focus is on another window, then stage = 3`
`158`	`176`	`if (nowActivatedWindowHandle != desktopHandle)`
`159`	`177`	`{`
`160`	`178`	`_rdpStage = 3;`
`@@ -168,14 +186,14 @@ private void RunForRdp()`
`168`	`186`	`}`
`169`	`187`	`else if (_rdpStage == 3)`
`170`	`188`	`{`
`171`		`- // 3 - neither RDP nor local desk lost focus, can not rollback to RDP, do nothing`
	`189`	`+ // 3 - neither RDP nor local desktop has focus, cannot rollback to RDP, do nothing`
`172`	`190`	`}`
`173`	`191`
`174`	`192`	`if (_rdpStage != 1 && isMouseInside && _myHandle == nowActivatedWindowHandle)`
`175`	`193`	`{`
`176`	`194`	`_rdpStage = 1;`
`177`	`195`	`}`
`178`		`- }`
	`196`	`+ }`
`179`	`197`	`#endregion`
`180`	`198`	`}`
`181`	`199`	`}`