Fix crash on desktop switch (#18)

Fix crash on desktop switch

Close #15.

Author: AkazaRenn

samples/VirtualDesktop.Showcase/MainWindow.xaml.cs

@@ -232,6 +232,7 @@ private void MoveLeft(object sender, RoutedEventArgs e)
             {
                 Debug.WriteLine($"Moved: {it.Index} -> {it.Index - 1}");
                 VirtualDesktop.Current.Move(it.Index - 1);
+                return;
             }
         }
     }
@@ -244,6 +245,7 @@ private void MoveRight(object sender, RoutedEventArgs e)
             {
                 Debug.WriteLine($"Moved: {it.Index} -> {it.Index + 1}");
                 VirtualDesktop.Current.Move(it.Index + 1);
+                return;
             }
         }
     }

src/VirtualDesktop/Interop/Build10240_0000/VirtualDesktopNotificationService.cs

@@ -65,7 +65,7 @@ protected void ViewChangedCore(object view)
 
         protected void CurrentChangedCore(object pDesktopOld, object pDesktopNew)
             => this.Notification.CurrentVirtualDesktopChanged(this.Wrap(pDesktopOld), this.Wrap(pDesktopNew));
-        
+
         private IVirtualDesktop Wrap(object desktop)
             => this.Factory.VirtualDesktop(desktop).Interface;
     }

src/VirtualDesktop/Interop/Build22621_2215/.interfaces/IVirtualDesktopNotification.cs

@@ -26,10 +26,10 @@ public interface IVirtualDesktopNotification
         void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
 
         void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, HString chPath);
-        
-        IVirtualDesktop VirtualDesktopSwitched();
-        
-        IVirtualDesktop RemoteVirtualDesktopConnected();
+
+        void VirtualDesktopSwitched(IVirtualDesktop pDesktop);
+
+        void RemoteVirtualDesktopConnected(IVirtualDesktop pDesktop);
     }
 
     internal class VirtualDesktopNotification : VirtualDesktopNotificationService.EventListenerBase, IVirtualDesktopNotification
@@ -78,16 +78,16 @@ public void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, HString chP
         {
             this.WallpaperChangedCore(pDesktop, chPath);
         }
-        
-        public IVirtualDesktop VirtualDesktopSwitched()
+
+        public void VirtualDesktopSwitched(IVirtualDesktop pDesktop)
         {
-            return this.VirtualDesktopSwitched();
+            this.SwitchedCore(pDesktop);
         }
 
-        public IVirtualDesktop RemoteVirtualDesktopConnected()
+        public void RemoteVirtualDesktopConnected(IVirtualDesktop pDesktop)
         {
-            return this.RemoteVirtualDesktopConnected();
+            this.RemoteConnectedCore(pDesktop);
         }
-        
+
     }
 }

src/VirtualDesktop/Interop/Build22621_2215/VirtualDesktopNotificationService.cs

@@ -62,7 +62,7 @@ protected void DestroyedCore(object pDesktopDestroyed, object pDesktopFallback)
 
         protected void MovedCore(object pDesktop, int nIndexFrom, int nIndexTo)
             => this.Notification.VirtualDesktopMoved(this.Wrap(pDesktop), nIndexFrom, nIndexTo);
-        
+
         protected void RenamedCore(object pDesktop, HString chName)
             => this.Notification.VirtualDesktopRenamed(this.Wrap(pDesktop), chName);
 
@@ -75,6 +75,12 @@ protected void CurrentChangedCore(object pDesktopOld, object pDesktopNew)
         protected void WallpaperChangedCore(object pDesktop, HString chPath)
             => this.Notification.VirtualDesktopWallpaperChanged(this.Wrap(pDesktop), chPath);
 
+        protected void SwitchedCore(object pDesktop)
+            => this.Notification.VirtualDesktopSwitched(this.Wrap(pDesktop));
+
+        protected void RemoteConnectedCore(object pDesktop)
+            => this.Notification.RemoteVirtualDesktopConnected(this.Wrap(pDesktop));
+
         private IVirtualDesktop Wrap(object desktop)
             => this.Factory.VirtualDesktop(desktop).Interface;
     }

src/VirtualDesktop/Interop/Proxy/IVirtualDesktopNotification.cs

@@ -1,4 +1,4 @@
-namespace WindowsDesktop.Interop.Proxy;
+namespace WindowsDesktop.Interop.Proxy;
 
 [ComInterface]
 public interface IVirtualDesktopNotification
@@ -22,4 +22,8 @@ public interface IVirtualDesktopNotification
     void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
 
     void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, string chPath);
+
+    void VirtualDesktopSwitched(IVirtualDesktop pDesktop);
+
+    void RemoteVirtualDesktopConnected(IVirtualDesktop pDesktop);
 }

src/VirtualDesktop/VirtualDesktop.notification.cs

@@ -69,6 +69,22 @@ partial class VirtualDesktop
     /// </remarks>
     public static event EventHandler<VirtualDesktopWallpaperChangedEventArgs>? WallpaperChanged;
 
+    /// <summary>
+    /// Occurs when a virtual desktop is switched. Seems duplicate to ViewVirtualDesktopChanged, the difference is not yet known. Both are fired when swtiching.
+    /// </summary>
+    /// <remarks>
+    /// See <see cref="CurrentChanged"/> for details.
+    /// </remarks>
+    public static event EventHandler<VirtualDesktopSwitchedEventArgs>? Switched;
+
+    /// <summary>
+    /// Occurs when a remote desktop is connected. Should be related to Windows 365 Cloud PC: https://www.microsoft.com/store/productId/9N1F85V9T8BN.
+    /// </summary>
+    /// <remarks>
+    /// See <see cref="CurrentChanged"/> for details.
+    /// </remarks>
+    public static event EventHandler<RemoteVirtualDesktopConnectedEventArgs>? RemoteConnected;
+
     /// <summary>
     /// Register a listener to receive changes in the application view.
     /// </summary>
@@ -101,7 +117,7 @@ public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualD
 
         public void VirtualDesktopIsPerMonitorChanged(int i)
         {
-            
+
         }
 
 
@@ -132,6 +148,12 @@ public void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, string chPa
 
             WallpaperChanged?.Invoke(this, new VirtualDesktopWallpaperChangedEventArgs(desktop, chPath));
         }
+
+        public void VirtualDesktopSwitched(IVirtualDesktop pDesktop) =>
+            Switched?.Invoke(this, new VirtualDesktopSwitchedEventArgs(pDesktop));
+
+        public void RemoteVirtualDesktopConnected(IVirtualDesktop pDesktop) =>
+            RemoteConnected?.Invoke(this, new RemoteVirtualDesktopConnectedEventArgs(pDesktop));
     }
 
     private class ViewChangedListener

src/VirtualDesktop/VirtualDesktopEventArgs.cs

@@ -106,3 +106,41 @@ internal VirtualDesktopDestroyEventArgs(IVirtualDesktop destroyed, IVirtualDeskt
     {
     }
 }
+
+/// <summary>
+/// Provides data for the <see cref="VirtualDesktop.Switched" /> event.
+/// </summary>
+public class VirtualDesktopSwitchedEventArgs: EventArgs
+{
+    public VirtualDesktop Desktop { get; }
+
+
+    public VirtualDesktopSwitchedEventArgs(VirtualDesktop desktop)
+    {
+        this.Desktop = desktop;
+    }
+
+    internal VirtualDesktopSwitchedEventArgs(IVirtualDesktop desktop)
+        : this(desktop.ToVirtualDesktop())
+    {
+    }
+}
+
+/// <summary>
+/// Provides data for the <see cref="VirtualDesktop.RemoteConnected" /> event.
+/// </summary>
+public class RemoteVirtualDesktopConnectedEventArgs: EventArgs
+{
+    public VirtualDesktop Desktop { get; }
+
+
+    public RemoteVirtualDesktopConnectedEventArgs(VirtualDesktop desktop)
+    {
+        this.Desktop = desktop;
+    }
+
+    internal RemoteVirtualDesktopConnectedEventArgs(IVirtualDesktop desktop)
+        : this(desktop.ToVirtualDesktop())
+    {
+    }
+}