Fix winui3 cursor bug(microsoft/microsoft-ui-xaml#7062)

Gaoyifei1011 · Sep 9, 2023 · df5dbc4 · df5dbc4
1 parent d2d5ae7
commit df5dbc4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -35,7 +35,6 @@
     <TargetPlatformMinVersion>10.0.19044.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
     <TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
-    <UseWinUI>true</UseWinUI>
     <WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
     <WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>
     <WindowsPackageType>MSIX</WindowsPackageType>

diff --git a/GetStoreApp/Helpers/Controls/Extensions/CursorHelper.cs b/GetStoreApp/Helpers/Controls/Extensions/CursorHelper.cs
@@ -17,20 +17,13 @@ public static InputSystemCursorShape GetCursor(DependencyObject obj)
         public static void SetCursor(DependencyObject obj, InputSystemCursorShape value)
         {
             obj.SetValue(CursorProperty, value);
-        }
-
-        public static readonly DependencyProperty CursorProperty =
-            DependencyProperty.RegisterAttached("Cursor", typeof(InputSystemCursorShape), typeof(CursorHelper), new PropertyMetadata(InputSystemCursorShape.Arrow, OnCursorChanged));
-
-        public static void OnCursorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
             if (obj is FrameworkElement element)
             {
-                element.Loaded += (sender, args) =>
-                {
-                    typeof(FrameworkElement).GetProperty("ProtectedCursor", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(element, InputSystemCursor.Create(GetCursor(sender as FrameworkElement)));
-                };
+                typeof(FrameworkElement).GetProperty("ProtectedCursor", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(element, InputSystemCursor.Create(GetCursor(element)));
             }
         }
+
+        public static readonly DependencyProperty CursorProperty =
+            DependencyProperty.RegisterAttached("Cursor", typeof(InputSystemCursorShape), typeof(CursorHelper), new PropertyMetadata(InputSystemCursorShape.Arrow));
     }
 }
diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 // 程序集信息设置
 [assembly: AssemblyCopyright("Copyright ©2022-2023 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("2.3.906.0")]
-[assembly: AssemblyInformationalVersion("2.3.906.0")]
+[assembly: AssemblyFileVersion("2.3.909.0")]
+[assembly: AssemblyInformationalVersion("2.3.909.0")]
 [assembly: AssemblyProduct("获取商店应用")]
 [assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("2.3.906.0")]
+[assembly: AssemblyVersion("2.3.909.0")]
 
 // 设置程序集对COM组件的访问权限
 [assembly: ComVisible(false)]

diff --git a/GetStoreApp/WindowsAPI/Controls/DataTransferManagerInterop.cs b/GetStoreApp/WindowsAPI/Controls/DataTransferManagerInterop.cs
@@ -1,7 +1,6 @@
 using GetStoreApp.WindowsAPI.ComTypes;
 using System;
 using Windows.ApplicationModel.DataTransfer;
-using WinRT;
 
 namespace GetStoreApp.WindowsAPI.Controls
 {
@@ -19,7 +18,7 @@ public static class DataTransferManagerInterop
         /// </summary>
         public static DataTransferManager GetForWindow(IntPtr window)
         {
-            return MarshalInterface<DataTransferManager>.FromAbi(dataTransferManagerInterop.GetForWindow(window, riid));
+            return DataTransferManager.FromAbi(dataTransferManagerInterop.GetForWindow(window, riid));
         }
 
         /// <summary>

diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -12,7 +12,7 @@
   <Identity
     Name="Gaoyifei1011.GetStoreApp"
     Publisher="CN=高怡飞"
-    Version="2.3.906.0" />
+    Version="2.3.909.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>