Minor Changes

Taiizor · Apr 4, 2024 · 60befb3 · 60befb3
1 parent 9d73362
commit 60befb3
Show file tree

Hide file tree

Showing 26 changed files with 75 additions and 85 deletions.
diff --git a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
         <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     </ItemGroup>
 

diff --git a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark" Version="3.1.3.4" />
+        <PackageReference Include="Skylark" Version="3.1.3.5" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 

diff --git a/src/Library/Sucrose.Memory/Constant.cs b/src/Library/Sucrose.Memory/Constant.cs
@@ -68,8 +68,6 @@ public static class Constant
 
         public const string StretchType = "StretchType";
 
-        public const string DisplayType = "DisplayType";
-
         public const string CultureName = "CultureName";
 
         public const string TitleLength = "TitleLength";
@@ -168,6 +166,8 @@ public static class Constant
 
         public const string CommunicationType = "CommunicationType";
 
+        public const string DisplayScreenType = "DisplayScreenType";
+
         public const string RemotePerformance = "RemotePerformance";
 
         public const string BackgroundOpacity = "BackgroundOpacity";

diff --git a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark" Version="3.1.3.4" />
+        <PackageReference Include="Skylark" Version="3.1.3.5" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2470-prerelease" />
     </ItemGroup>
 

diff --git a/src/Portal/Sucrose.Portal/Manage/Manager.cs b/src/Portal/Sucrose.Portal/Manage/Manager.cs
@@ -1,6 +1,7 @@
 using System.Windows.Media;
 using Wpf.Ui.Controls;
-using SEDST = Skylark.Enum.DuplicateScreenType;
+using SEDEST = Skylark.Enum.DuplicateScreenType;
+using SEDYST = Skylark.Enum.DisplayScreenType;
 using SEEST = Skylark.Enum.ExpandScreenType;
 using SEST = Skylark.Enum.ScreenType;
 using SEWTT = Skylark.Enum.WindowsThemeType;
@@ -9,7 +10,6 @@
 using SSCECT = Sucrose.Shared.Core.Enum.ChannelType;
 using SSCEUT = Sucrose.Shared.Core.Enum.UpdateType;
 using SSDECT = Sucrose.Shared.Dependency.Enum.CommunicationType;
-using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
 using SSDEPT = Sucrose.Shared.Dependency.Enum.PerformanceType;
 using SSDESKT = Sucrose.Shared.Dependency.Enum.SortKindType;
 using SSDESMT = Sucrose.Shared.Dependency.Enum.SortModeType;
@@ -38,9 +38,11 @@ internal static class Manager
 
         public static SSDEPT MemoryPerformance => SMMI.BackgroundogSettingManager.GetSetting(SMC.MemoryPerformance, SSDEPT.Pause);
 
+        public static SEDEST DuplicateScreenType => SMMI.EngineSettingManager.GetSetting(SMC.DuplicateScreenType, SEDEST.Default);
+
         public static SSDEPT FocusPerformance => SMMI.BackgroundogSettingManager.GetSetting(SMC.FocusPerformance, SSDEPT.Resume);
 
-        public static SEDST DuplicateScreenType => SMMI.EngineSettingManager.GetSetting(SMC.DuplicateScreenType, SEDST.Default);
+        public static SEDYST DisplayScreenType => SMMI.EngineSettingManager.GetSetting(SMC.DisplayScreenType, SEDYST.PerDisplay);
 
         public static SSDEPT SaverPerformance => SMMI.BackgroundogSettingManager.GetSetting(SMC.SaverPerformance, SSDEPT.Pause);
 
@@ -58,8 +60,6 @@ internal static class Manager
 
         public static SEST ScreenType => SMMI.EngineSettingManager.GetSetting(SMC.ScreenType, SEST.DisplayBound);
 
-        public static SSDEDT DisplayType => SMMI.EngineSettingManager.GetSetting(SMC.DisplayType, SSDEDT.Screen);
-
         public static SEWTT ThemeType => SMMI.GeneralSettingManager.GetSetting(SMC.ThemeType, SWHWT.GetTheme());
 
         public static SSDEST StretchType => SMMI.EngineSettingManager.GetSetting(SMC.StretchType, SSDEST.Fill);

diff --git a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
@@ -68,12 +68,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
         <PackageReference Include="XamlFlair.WPF" Version="1.2.13" />
         <PackageReference Include="XamlAnimatedGif" Version="2.2.3" />
         <PackageReference Include="WPF-UI" Version="3.0.0-preview.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
-        <PackageReference Include="Skylark.Clipboard" Version="3.1.2.7" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
+        <PackageReference Include="Skylark.Clipboard" Version="3.1.2.8" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
         <PackageReference Include="WindowsAPICodePackShell" Version="8.0.2" />
     </ItemGroup>

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml.cs
@@ -3,7 +3,8 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using Wpf.Ui.Controls;
-using SEDST = Skylark.Enum.DuplicateScreenType;
+using SEDEST = Skylark.Enum.DuplicateScreenType;
+using SEDYST = Skylark.Enum.DisplayScreenType;
 using SEEST = Skylark.Enum.ExpandScreenType;
 using SMC = Sucrose.Memory.Constant;
 using SMMI = Sucrose.Manager.Manage.Internal;
@@ -14,7 +15,6 @@
 using SPVCDE = Sucrose.Portal.Views.Controls.Display.Expand;
 using SPVCDS = Sucrose.Portal.Views.Controls.Display.Screen;
 using SRER = Sucrose.Resources.Extension.Resources;
-using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
 using SSLHK = Sucrose.Shared.Live.Helper.Kill;
 using SSLHR = Sucrose.Shared.Live.Helper.Run;
 using SSSHL = Sucrose.Shared.Space.Helper.Live;
@@ -154,9 +154,9 @@ private async void ScreenChecked()
             ExpanderExpandContent.Visibility = Visibility.Collapsed;
             ExpanderDuplicateContent.Visibility = Visibility.Collapsed;
 
-            if (SPMM.DisplayType != SSDEDT.Screen)
+            if (SPMM.DisplayScreenType != SEDYST.PerDisplay)
             {
-                SMMI.EngineSettingManager.SetSetting(SMC.DisplayType, SSDEDT.Screen);
+                SMMI.EngineSettingManager.SetSetting(SMC.DisplayScreenType, SEDYST.PerDisplay);
 
                 Restart();
             }
@@ -170,9 +170,9 @@ private async void ExpandChecked()
             ExpanderExpandContent.Visibility = Visibility.Visible;
             ExpanderDuplicateContent.Visibility = Visibility.Collapsed;
 
-            if (SPMM.DisplayType != SSDEDT.Expand)
+            if (SPMM.DisplayScreenType != SEDYST.SpanAcross)
             {
-                SMMI.EngineSettingManager.SetSetting(SMC.DisplayType, SSDEDT.Expand);
+                SMMI.EngineSettingManager.SetSetting(SMC.DisplayScreenType, SEDYST.SpanAcross);
 
                 Restart();
             }
@@ -186,9 +186,9 @@ private async void DuplicateChecked()
             ExpanderExpandContent.Visibility = Visibility.Collapsed;
             ExpanderDuplicateContent.Visibility = Visibility.Visible;
 
-            if (SPMM.DisplayType != SSDEDT.Duplicate)
+            if (SPMM.DisplayScreenType != SEDYST.SameDuplicate)
             {
-                SMMI.EngineSettingManager.SetSetting(SMC.DisplayType, SSDEDT.Duplicate);
+                SMMI.EngineSettingManager.SetSetting(SMC.DisplayScreenType, SEDYST.SameDuplicate);
 
                 Restart();
             }
@@ -204,7 +204,7 @@ private void ExpandScreenTypeChecked(SEEST Type)
             }
         }
 
-        private void DuplicateScreenTypeChecked(SEDST Type)
+        private void DuplicateScreenTypeChecked(SEDEST Type)
         {
             if (SPMM.DuplicateScreenType != Type)
             {
@@ -297,7 +297,7 @@ private async void ContentDialog_Loaded(object sender, RoutedEventArgs e)
 
             ExpanderDuplicateContent.Children.Add(DuplicateHint);
 
-            foreach (SEDST Type in Enum.GetValues(typeof(SEDST)))
+            foreach (SEDEST Type in Enum.GetValues(typeof(SEDEST)))
             {
                 RadioButton Radio = new()
                 {
@@ -311,12 +311,12 @@ private async void ContentDialog_Loaded(object sender, RoutedEventArgs e)
                 ExpanderDuplicateContent.Children.Add(Radio);
             }
 
-            switch (SPMM.DisplayType)
+            switch (SPMM.DisplayScreenType)
             {
-                case SSDEDT.Expand:
+                case SEDYST.SpanAcross:
                     Expand.IsChecked = true;
                     break;
-                case SSDEDT.Duplicate:
+                case SEDYST.SameDuplicate:
                     Duplicate.IsChecked = true;
                     break;
                 default:

diff --git a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj
@@ -70,9 +70,9 @@
     <ItemGroup>
         <PackageReference Include="NAudio" Version="2.2.1" />
         <PackageReference Include="NPSMLib" Version="0.9.14" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
         <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
         <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre276" />
     </ItemGroup>
 

diff --git a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
@@ -69,8 +69,8 @@
 
     <ItemGroup>
         <PackageReference Include="TaskScheduler" Version="2.10.1" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.WPF.CS/Main.xaml.cs b/src/Project/Sucrose.WPF.CS/Main.xaml.cs
@@ -100,7 +100,7 @@ private IntPtr CatchMouseEvent(int nCode, IntPtr wParam, IntPtr lParam)
                 {
                     MouseExtraHookStruct HookStruct = (MouseExtraHookStruct)Marshal.PtrToStructure(lParam, typeof(MouseExtraHookStruct));
 
-                    MousePointStruct Position = Calculate.MousePosition(HookStruct, MouseScreenType.SpanAcross); //MouseScreenType.PerDisplay
+                    MousePointStruct Position = Calculate.MousePosition(HookStruct, DisplayScreenType.SpanAcross); //DisplayScreenType.PerDisplay
 
                     int X = Position.X;
                     int Y = Position.Y;

diff --git a/src/Project/Sucrose.WPF.CS/Sucrose.WPF.CS.csproj b/src/Project/Sucrose.WPF.CS/Sucrose.WPF.CS.csproj
@@ -70,8 +70,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj
@@ -68,8 +68,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.3.5" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.4.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.3.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.4.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine/Event/Handler.cs b/src/Shared/Engine/Sucrose.Shared.Engine/Event/Handler.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using System.Windows;
-using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
+using SEDST = Skylark.Enum.DisplayScreenType;
 using SSEHD = Sucrose.Shared.Engine.Helper.Data;
 using SWE = Skylark.Wing.Engine;
 using SWHPI = Skylark.Wing.Helper.ProcessInterop;
@@ -27,12 +27,12 @@ public static void WindowLoaded(Window Window)
 
         public static void ContentRendered(Window Window)
         {
-            switch (SSEHD.GetDisplayType())
+            switch (SSEHD.GetDisplayScreenType())
             {
-                case SSDEDT.Expand:
+                case SEDST.SpanAcross:
                     SWE.WallpaperWindow(Window, SSEHD.GetExpandScreenType(), SSEHD.GetScreenType());
                     break;
-                case SSDEDT.Duplicate:
+                case SEDST.SameDuplicate:
                     SWE.WallpaperWindow(Window, SSEHD.GetDuplicateScreenType(), SSEHD.GetScreenType());
                     break;
                 default:
@@ -58,12 +58,12 @@ public static void ApplicationLoaded(Process Process)
 
         public static void ApplicationRendered(Process Process)
         {
-            switch (SSEHD.GetDisplayType())
+            switch (SSEHD.GetDisplayScreenType())
             {
-                case SSDEDT.Expand:
+                case SEDST.SpanAcross:
                     SWE.WallpaperProcess(Process, SSEHD.GetExpandScreenType(), SSEHD.GetScreenType());
                     break;
-                case SSDEDT.Duplicate:
+                case SEDST.SameDuplicate:
                     //SWE.WallpaperProcess(Process, SSEHD.GetDuplicateScreenType(), SSEHD.GetScreenType());
                     break;
                 default:

diff --git a/src/Shared/Engine/Sucrose.Shared.Engine/Helper/Data.cs b/src/Shared/Engine/Sucrose.Shared.Engine/Helper/Data.cs
@@ -1,8 +1,8 @@
-using SEDST = Skylark.Enum.DuplicateScreenType;
+using SEDEST = Skylark.Enum.DuplicateScreenType;
+using SEDYST = Skylark.Enum.DisplayScreenType;
 using SEEST = Skylark.Enum.ExpandScreenType;
 using SEST = Skylark.Enum.ScreenType;
 using SMMM = Sucrose.Manager.Manage.Manager;
-using SSDEDT = Sucrose.Shared.Dependency.Enum.DisplayType;
 using SSDEST = Sucrose.Shared.Dependency.Enum.StretchType;
 using SSEMM = Sucrose.Shared.Engine.Manage.Manager;
 using SWUD = Skylark.Wing.Utility.Desktop;
@@ -62,17 +62,17 @@ public static int GetScreenIndex()
             return SMMM.ScreenIndex;
         }
 
-        public static SSDEDT GetDisplayType()
+        public static SEEST GetExpandScreenType()
         {
-            return SSEMM.DisplayType;
+            return SSEMM.ExpandScreenType;
         }
 
-        public static SEEST GetExpandScreenType()
+        public static SEDYST GetDisplayScreenType()
         {
-            return SSEMM.ExpandScreenType;
+            return SSEMM.DisplayScreenType;
         }
 
-        public static SEDST GetDuplicateScreenType()
+        public static SEDEST GetDuplicateScreenType()
         {
             return SSEMM.DuplicateScreenType;
         }