Move GameEventButtonPosition to Plugin.Core

Author: neon-nyan

CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs

@@ -7,8 +7,8 @@
 using Hi3Helper.Data;
 using Hi3Helper.EncTool;
 using Hi3Helper.EncTool.Parser.AssetMetadata;
+using Hi3Helper.Plugin.Core.UI.Controls;
 using Hi3Helper.SentryHelper;
-using Microsoft.UI.Xaml;
 using Microsoft.Win32;
 using System;
 using System.Buffers;
@@ -22,7 +22,6 @@
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using Windows.Foundation;
 using WinRT;
 using static Hi3Helper.Logger;
 // ReSharper disable InconsistentNaming
@@ -79,25 +78,11 @@ public enum GameVendorType
     public enum LauncherType
     {
         Legacy,
-        Sophon = Legacy,
+        Sophon,
         HoYoPlay,
         Plugin
     }
 
-    [GeneratedBindableCustomProperty]
-    public partial class GameEventButtonPosition
-    {
-        [JsonConverter(typeof(JsonStringEnumConverter<HorizontalAlignment>))]
-        public HorizontalAlignment HorizontalAlignment { get; init; } = HorizontalAlignment.Left;
-
-        [JsonConverter(typeof(JsonStringEnumConverter<VerticalAlignment>))]
-        public VerticalAlignment VerticalAlignment { get; init; } = VerticalAlignment.Top;
-
-        public Thickness Position { get; init; } = new(256, 596, 0, 0);
-        public double    VSize    { get; init; } = 80d;
-        public Size FrameSize { get; init; } = new(2560, 1440);
-    }
-
     public class GameInstallFileInfo
     {
         public string   GameDataFolderName               { get; init; } = string.Empty;
@@ -335,7 +320,7 @@ internal static class PresetConfigExt
         }
     }
 
-    [JsonSourceGenerationOptions(IncludeFields = false, GenerationMode = JsonSourceGenerationMode.Metadata, IgnoreReadOnlyFields = true)]
+    [JsonSourceGenerationOptions(IncludeFields = false, IgnoreReadOnlyFields = true)]
     [JsonSerializable(typeof(PresetConfig))]
     internal sealed partial class PresetConfigJsonContext : JsonSerializerContext;
 
@@ -557,7 +542,12 @@ public SophonChunkUrls? LauncherResourceChunksURL
 
         public GameInstallFileInfo? GameInstallFileInfo { get; init; }
 
-        public GameEventButtonPosition GameEventButtonPosition { get => field ??= new GameEventButtonPosition(); init; }
+        private GameEventButtonPosition? _gameEventButtonPosition;
+        public GameEventButtonPosition GameEventButtonPosition
+        {
+            get => _gameEventButtonPosition.HasValue && _gameEventButtonPosition.Value != default ? _gameEventButtonPosition.Value : GameEventButtonPosition.Default;
+            init => _gameEventButtonPosition = value;
+        }
 
         #endregion
 

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

@@ -41,6 +41,9 @@
         <pages:TimeSpanToNumberMillisecondsConverter x:Key="TimeSpanToNumberMillisecondsConverter" />
         <pages:TimeSpanMoreThan15SecondsToVisibilityConverter x:Key="TimeSpanMoreThan15SecondsToVisibilityConverter" />
         <pages:FontPathLookupConverter x:Key="FontPathLookupConverter" />
+        <pages:PluginHorizontalAlignmentConverter x:Key="PluginHorizontalAlignmentConverter" />
+        <pages:PluginVerticalAlignmentConverter x:Key="PluginVerticalAlignmentConverter" />
+        <pages:PluginDoublePositionToThicknessConverter x:Key="PluginDoublePositionToThicknessConverter" />
         <c:IndexAddOneConverter x:Key="IndexAddOneConverter" />
 
         <MenuFlyout x:Key="BackgroundContextMenuFlyout"
@@ -194,21 +197,22 @@
                           PointerPressed="ClickImageEventSpriteLink"
                           PointerEntered="ImageEventImg_OnPointerEntered"
                           PointerExited="ImageEventImg_OnPointerExited"
-                          HorizontalAlignment="{x:Bind CurrentPresetConfig.GameEventButtonPosition.HorizontalAlignment, Mode=OneWay}"
-                          VerticalAlignment="{x:Bind CurrentPresetConfig.GameEventButtonPosition.VerticalAlignment, Mode=OneWay}"
-                          Height="{x:Bind CurrentPresetConfig.GameEventButtonPosition.VSize, Mode=OneWay}"
-                          Margin="{x:Bind CurrentPresetConfig.GameEventButtonPosition.Position, Mode=OneWay}"
+                          HorizontalAlignment="{x:Bind CurrentPresetConfig.GameEventButtonPosition.HorizontalAlignment, Mode=OneWay, Converter={StaticResource PluginHorizontalAlignmentConverter}}"
+                          VerticalAlignment="{x:Bind CurrentPresetConfig.GameEventButtonPosition.VerticalAlignment, Mode=OneWay, Converter={StaticResource PluginVerticalAlignmentConverter}}"
+                          Width="{x:Bind CurrentPresetConfig.GameEventButtonPosition.IconSize.Width, Mode=OneWay}"
+                          Height="{x:Bind CurrentPresetConfig.GameEventButtonPosition.IconSize.Height, Mode=OneWay}"
+                          Margin="{x:Bind CurrentPresetConfig.GameEventButtonPosition.Position, Mode=OneWay, Converter={StaticResource PluginDoublePositionToThicknessConverter}}"
                           Tag="{x:Bind CurrentGameBackgroundData.FeaturedEventIconClickLink, Mode=OneWay}"
                           Visibility="{x:Bind IsShowSidePanel, Converter={StaticResource BooleanVisibilityConverter}}">
-                        <c:NonFaultyImageEx
-                            x:Name="ImageEventImgNormal"
-                            x:FieldModifier="internal"
-                            Source="{x:Bind CurrentGameBackgroundData.FeaturedEventIconUrl, Mode=OneWay, Converter={StaticResource UrlToCachedImagePathConverter}}"/>
                         <c:NonFaultyImageEx
                             x:Name="ImageEventImgHover"
                             x:FieldModifier="internal"
                             Source="{x:Bind CurrentGameBackgroundData.FeaturedEventIconHoverUrl, Mode=OneWay, Converter={StaticResource UrlToCachedImagePathConverter}}"
-                            Visibility="Collapsed"/>
+                            Opacity="0"/>
+                        <c:NonFaultyImageEx
+                            x:Name="ImageEventImgNormal"
+                            x:FieldModifier="internal"
+                            Source="{x:Bind CurrentGameBackgroundData.FeaturedEventIconUrl, Mode=OneWay, Converter={StaticResource UrlToCachedImagePathConverter}}"/>
                     </Grid>
                 </Grid>
             </Grid>