fix: Incorrect size when restoring a minimized and disconnected RDP.

VShawn · VShawn · commit 9343b221e1eb · 2025-04-17T11:00:45.000+08:00
close #913
diff --git a/Ui/AppVersion.cs b/Ui/AppVersion.cs
@@ -6,10 +6,10 @@ public static class AppVersion
     {
         public const uint Major = 1;
         public const uint Minor = 2;
-        public const uint Patch = 0;
+        public const uint Patch = 1;
         public const uint Build = 0;
         public const string BuildDate = "";
-        public const string PreRelease = ""; // e.g. "alpha" "beta.2"
+        public const string PreRelease = "alpha"; // e.g. "alpha" "beta.2"
 
         public static readonly Version VersionData = new Version(Major, Minor, Patch, Build, PreRelease);
         public static string Version => VersionData.ToString();
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs
@@ -785,16 +785,16 @@ public override IntPtr GetHostHwnd()
 
         public override bool CanResizeNow()
         {
-            return Status == ProtocolHostStatus.Connected;
+            return Status == ProtocolHostStatus.Connected || Status == ProtocolHostStatus.Disconnected;
         }
 
         #endregion Base Interface
 
 
         #region WindowOnResizeEnd
 
-        private readonly System.Timers.Timer _resizeEndTimer = new(500) { Enabled = false, AutoReset = false };
-        private readonly object _resizeEndLocker = new();
+        private readonly Timer _resizeEndTimer = new Timer(500) { Enabled = false, AutoReset = false };
+        private readonly Lock _resizeEndLocker = new Lock();
         private bool _canAutoResizeByWindowSizeChanged = true;
 
         /// <summary>
diff --git a/Ui/View/Host/ProtocolHosts/HostBase.cs b/Ui/View/Host/ProtocolHosts/HostBase.cs
@@ -19,9 +19,9 @@ public enum ProtocolHostStatus
         Initializing,
         Initialized,
         Connecting,
+        WaitingForReconnect,
         Connected,
         Disconnected,
-        WaitingForReconnect
     }
 
     public enum ProtocolHostType
diff --git a/Ui/View/Host/TabWindowView.xaml.cs b/Ui/View/Host/TabWindowView.xaml.cs
@@ -53,10 +53,10 @@ public TabWindowView()
                 {
                     if (this.WindowState == WindowState.Normal)
                     {
-                        IoC.Get<LocalityService>().TabWindowHeight = this.Height;
-                        IoC.Get<LocalityService>().TabWindowWidth = this.Width;
+                        IoC.Get<LocalityService>().TabWindowWidth = this.ActualWidth;
+                        IoC.Get<LocalityService>().TabWindowHeight = this.ActualHeight;
                     }
-                    SimpleLogHelper.Debug($"Tab size change to:W = {this.Width}, H = {this.Height}");
+                    SimpleLogHelper.DebugInfo($"(Window size changed) Tab size change to:W = {this.ActualWidth}, H = {this.ActualHeight}");
                 };
 
                 // remember window pos when size changed
@@ -81,7 +81,7 @@ public TabWindowView()
                     }
                     Vm?.SelectedItem?.Content?.ToggleAutoResize(true);
                     IoC.Get<LocalityService>().TabWindowState = this.WindowState;
-                    SimpleLogHelper.Debug($"(Window state changed)Tab size change to:W = {this.Width}, H = {this.Height}");
+                    SimpleLogHelper.DebugInfo($"(Window state changed) Tab size change to:W = {this.ActualWidth}, H = {this.ActualHeight}");
                 };
 
 
diff --git a/Ui/View/Host/TabWindowViewModel.cs b/Ui/View/Host/TabWindowViewModel.cs
@@ -240,7 +240,6 @@ public RelayCommand CmdGoMaximize
                     {
                         View.WindowState = WindowState.Maximized;
                     }
-
                     else
                     {
                         View.WindowStyle = WindowStyle.SingleBorderWindow;

Original file line number	Diff line number	Diff line change
`@@ -785,16 +785,16 @@ public override IntPtr GetHostHwnd()`
`785`	`785`
`786`	`786`	`public override bool CanResizeNow()`
`787`	`787`	`{`
`788`		`- return Status == ProtocolHostStatus.Connected;`
	`788`	`+ return Status == ProtocolHostStatus.Connected \|\| Status == ProtocolHostStatus.Disconnected;`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`#endregion Base Interface`
`792`	`792`
`793`	`793`
`794`	`794`	`#region WindowOnResizeEnd`
`795`	`795`
`796`		`- private readonly System.Timers.Timer _resizeEndTimer = new(500) { Enabled = false, AutoReset = false };`
`797`		`- private readonly object _resizeEndLocker = new();`
	`796`	`+ private readonly Timer _resizeEndTimer = new Timer(500) { Enabled = false, AutoReset = false };`
	`797`	`+ private readonly Lock _resizeEndLocker = new Lock();`
`798`	`798`	`private bool _canAutoResizeByWindowSizeChanged = true;`
`799`	`799`
`800`	`800`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ public TabWindowView()`
`53`	`53`	`{`
`54`	`54`	`if (this.WindowState == WindowState.Normal)`
`55`	`55`	`{`
`56`		`- IoC.Get<LocalityService>().TabWindowHeight = this.Height;`
`57`		`- IoC.Get<LocalityService>().TabWindowWidth = this.Width;`
	`56`	`+ IoC.Get<LocalityService>().TabWindowWidth = this.ActualWidth;`
	`57`	`+ IoC.Get<LocalityService>().TabWindowHeight = this.ActualHeight;`
`58`	`58`	`}`
`59`		`- SimpleLogHelper.Debug($"Tab size change to:W = {this.Width}, H = {this.Height}");`
	`59`	`+ SimpleLogHelper.DebugInfo($"(Window size changed) Tab size change to:W = {this.ActualWidth}, H = {this.ActualHeight}");`
`60`	`60`	`};`
`61`	`61`
`62`	`62`	`// remember window pos when size changed`
`@@ -81,7 +81,7 @@ public TabWindowView()`
`81`	`81`	`}`
`82`	`82`	`Vm?.SelectedItem?.Content?.ToggleAutoResize(true);`
`83`	`83`	`IoC.Get<LocalityService>().TabWindowState = this.WindowState;`
`84`		`- SimpleLogHelper.Debug($"(Window state changed)Tab size change to:W = {this.Width}, H = {this.Height}");`
	`84`	`+ SimpleLogHelper.DebugInfo($"(Window state changed) Tab size change to:W = {this.ActualWidth}, H = {this.ActualHeight}");`
`85`	`85`	`};`
`86`	`86`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,6 @@ public RelayCommand CmdGoMaximize`
`240`	`240`	`{`
`241`	`241`	`View.WindowState = WindowState.Maximized;`
`242`	`242`	`}`
`243`		`-`
`244`	`243`	`else`
`245`	`244`	`{`
`246`	`245`	`View.WindowStyle = WindowStyle.SingleBorderWindow;`