fix: Restore window when opening the same RDP server and the server is opened with minimized, fix #381

VShawn · VShawn · commit cd39587e5d0d · 2023-03-18T22:42:30.000+08:00
diff --git a/Ui/Service/SessionControlService.cs b/Ui/Service/SessionControlService.cs
@@ -22,6 +22,7 @@
 using ProtocolHostStatus = _1RM.View.Host.ProtocolHosts.ProtocolHostStatus;
 using _1RM.Service.DataSource;
 using System.Collections.Generic;
+using Shawn.Utils.WpfResources.Theme.Styles;
 
 namespace _1RM.Service
 {
@@ -122,13 +123,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)
             if (server.IsOnlyOneInstance() && _connectionId2Hosts.ContainsKey(serverId))
             {
                 SimpleLogHelper.Debug($"_connectionId2Hosts ContainsKey {serverId}");
-                if (_connectionId2Hosts[serverId].ParentWindow is TabWindowBase t)
+                if (_connectionId2Hosts[serverId].ParentWindow is { } win)
                 {
-                    var s = t.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);
-                    if (s != null)
-                        t.GetViewModel().SelectedItem = s;
+                    if (win is TabWindowBase tab)
+                    {
+                        var s = tab.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);
+                        if (s != null)
+                            tab.GetViewModel().SelectedItem = s;
+                    }
 
-                    if (t.IsClosed)
+                    if (win.IsClosed)
                     {
                         MarkProtocolHostToClose(new string[] { serverId.ToString() });
                         CleanupProtocolsAndWindows();
@@ -139,9 +143,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)
                     {
                         Execute.OnUIThreadSync(() =>
                         {
-                            t.Show();
-                            t.Activate();
+                            if (win.IsClosing == false)
+                            {
+                                win.WindowState = win.WindowState == WindowState.Minimized ? WindowState.Normal : win.WindowState;
+                                win.Show();
+                                win.Activate();
+                            }
                         });
+
+                        var vmServer = _appData.GetItemById(server.DataSourceName, server.Id);
+                        vmServer?.UpdateConnectTime();
                     }
                     catch (Exception e)
                     {
@@ -150,6 +161,7 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)
                         CleanupProtocolsAndWindows();
                     }
                 }
+
                 if (_connectionId2Hosts[serverId].ParentWindow != null)
                 {
                     if (_connectionId2Hosts[serverId].Status != ProtocolHostStatus.Connected)
diff --git a/Ui/Service/SessionControlService_OpenConnection.cs b/Ui/Service/SessionControlService_OpenConnection.cs
@@ -138,13 +138,9 @@ private void ConnectWithTab(in ProtocolBase protocol, in Runner runner, string a
             Execute.OnUIThreadSync(() =>
             {
                 tab ??= this.GetOrCreateTabWindow(assignTabToken);
-                if (tab == null)
-                    return;
-
-                Execute.OnUIThreadSync(() =>
-                {
-                    tab.Show();
-                });
+                if (tab == null) return;
+                if (tab.IsClosing) return;
+                tab.Show();
 
                 // get display area size for host
                 Debug.Assert(!_connectionId2Hosts.ContainsKey(host.ConnectionId));
@@ -153,10 +149,7 @@ private void ConnectWithTab(in ProtocolBase protocol, in Runner runner, string a
                 tab.GetViewModel().AddItem(new TabItemViewModel(host, displayName));
                 _connectionId2Hosts.TryAdd(host.ConnectionId, host);
                 host.Conn();
-                if (tab.WindowState == WindowState.Minimized)
-                {
-                    tab.WindowState = WindowState.Normal;
-                }
+                tab.WindowState = tab.WindowState == WindowState.Minimized ? WindowState.Normal : tab.WindowState;
                 tab.Activate();
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`using ProtocolHostStatus = _1RM.View.Host.ProtocolHosts.ProtocolHostStatus;`
`23`	`23`	`using _1RM.Service.DataSource;`
`24`	`24`	`using System.Collections.Generic;`
	`25`	`+using Shawn.Utils.WpfResources.Theme.Styles;`
`25`	`26`
`26`	`27`	`namespace _1RM.Service`
`27`	`28`	`{`
`@@ -122,13 +123,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)`
`122`	`123`	`if (server.IsOnlyOneInstance() && _connectionId2Hosts.ContainsKey(serverId))`
`123`	`124`	`{`
`124`	`125`	`SimpleLogHelper.Debug($"_connectionId2Hosts ContainsKey {serverId}");`
`125`		`- if (_connectionId2Hosts[serverId].ParentWindow is TabWindowBase t)`
	`126`	`+ if (_connectionId2Hosts[serverId].ParentWindow is { } win)`
`126`	`127`	`{`
`127`		`- var s = t.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);`
`128`		`- if (s != null)`
`129`		`- t.GetViewModel().SelectedItem = s;`
	`128`	`+ if (win is TabWindowBase tab)`
	`129`	`+ {`
	`130`	`+ var s = tab.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId);`
	`131`	`+ if (s != null)`
	`132`	`+ tab.GetViewModel().SelectedItem = s;`
	`133`	`+ }`
`130`	`134`
`131`		`- if (t.IsClosed)`
	`135`	`+ if (win.IsClosed)`
`132`	`136`	`{`
`133`	`137`	`MarkProtocolHostToClose(new string[] { serverId.ToString() });`
`134`	`138`	`CleanupProtocolsAndWindows();`
`@@ -139,9 +143,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)`
`139`	`143`	`{`
`140`	`144`	`Execute.OnUIThreadSync(() =>`
`141`	`145`	`{`
`142`		`- t.Show();`
`143`		`- t.Activate();`
	`146`	`+ if (win.IsClosing == false)`
	`147`	`+ {`
	`148`	`+ win.WindowState = win.WindowState == WindowState.Minimized ? WindowState.Normal : win.WindowState;`
	`149`	`+ win.Show();`
	`150`	`+ win.Activate();`
	`151`	`+ }`
`144`	`152`	`});`
	`153`	`+`
	`154`	`+ var vmServer = _appData.GetItemById(server.DataSourceName, server.Id);`
	`155`	`+ vmServer?.UpdateConnectTime();`
`145`	`156`	`}`
`146`	`157`	`catch (Exception e)`
`147`	`158`	`{`
`@@ -150,6 +161,7 @@ private bool ActivateOrReConnIfServerSessionIsOpened(in ProtocolBase server)`
`150`	`161`	`CleanupProtocolsAndWindows();`
`151`	`162`	`}`
`152`	`163`	`}`
	`164`	`+`
`153`	`165`	`if (_connectionId2Hosts[serverId].ParentWindow != null)`
`154`	`166`	`{`
`155`	`167`	`if (_connectionId2Hosts[serverId].Status != ProtocolHostStatus.Connected)`