Added a few helpers

iNKORE-NET · Jan 23, 2024 · 83094c3 · 83094c3
1 parent 99f9dd7
commit 83094c3
Show file tree

Hide file tree

Showing 17 changed files with 927 additions and 178 deletions.
diff --git a/iNKORE.UI.WPF.sln b/iNKORE.UI.WPF.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33717.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Inkore.UI.WPF", "source\Inkore.UI.WPF\Inkore.UI.WPF.csproj", "{BE12577B-8E19-4255-A07D-E45EC64F8A48}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iNKORE.UI.WPF", "source\iNKORE.UI.WPF\iNKORE.UI.WPF.csproj", "{BE12577B-8E19-4255-A07D-E45EC64F8A48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp1", "samples\WpfApp1\WpfApp1.csproj", "{6EBBC925-2135-40AB-AF6F-96FF5C418F98}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApp1", "samples\WpfApp1\WpfApp1.csproj", "{6EBBC925-2135-40AB-AF6F-96FF5C418F98}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/samples/WpfApp1/obj/WpfApp1.csproj.nuget.dgspec.json b/samples/WpfApp1/obj/WpfApp1.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj": {}
+    "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj": {}
   },
   "projects": {
-    "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj": {
+    "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
+        "projectUniqueName": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
         "projectName": "WpfApp1",
-        "projectPath": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
+        "projectPath": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
         "packagesPath": "C:\\Users\\Yoojun\\.nuget\\packages\\",
-        "outputPath": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\obj\\",
+        "outputPath": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
           "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
@@ -57,7 +57,7 @@
           "downloadDependencies": [
             {
               "name": "Microsoft.Windows.SDK.NET.Ref",
-              "version": "[10.0.18362.28, 10.0.18362.28]"
+              "version": "[10.0.18362.31, 10.0.18362.31]"
             }
           ],
           "frameworkReferences": {
@@ -71,7 +71,7 @@
               "privateAssets": "none"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.404\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/samples/WpfApp1/obj/WpfApp1.csproj.nuget.g.props b/samples/WpfApp1/obj/WpfApp1.csproj.nuget.g.props
@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Yoojun\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Yoojun\.nuget\packages\" />

diff --git a/samples/WpfApp1/obj/project.assets.json b/samples/WpfApp1/obj/project.assets.json
@@ -14,11 +14,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
+      "projectUniqueName": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
       "projectName": "WpfApp1",
-      "projectPath": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
+      "projectPath": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
       "packagesPath": "C:\\Users\\Yoojun\\.nuget\\packages\\",
-      "outputPath": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\obj\\",
+      "outputPath": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
         "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
@@ -64,7 +64,7 @@
         "downloadDependencies": [
           {
             "name": "Microsoft.Windows.SDK.NET.Ref",
-            "version": "[10.0.18362.28, 10.0.18362.28]"
+            "version": "[10.0.18362.31, 10.0.18362.31]"
           }
         ],
         "frameworkReferences": {
@@ -78,7 +78,7 @@
             "privateAssets": "none"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.304\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.404\\RuntimeIdentifierGraph.json"
       }
     }
   }

diff --git a/samples/WpfApp1/obj/project.nuget.cache b/samples/WpfApp1/obj/project.nuget.cache
@@ -1,10 +1,10 @@
 {
   "version": 2,
-  "dgSpecHash": "CRxa6hDyqqKq67TTEHi36RUsP5+0o375ALWOm1Q7KoxQM9WnPho77vGcTI+UjKDaBDabnG+K6iW+Sz196EpiFA==",
+  "dgSpecHash": "i3EUg+wojqO8kwjU817VP7Bl/5EvTAMSwMRrAcI34W6I1G/IEhv0Udq2kxrMtT9Y9HXCzvn3iFuP0ByWhQVGsA==",
   "success": true,
-  "projectFilePath": "E:\\Yujun Products\\Inkore.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
+  "projectFilePath": "E:\\Yujun Products\\iNKORE.UI.WPF\\samples\\WpfApp1\\WpfApp1.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\Yoojun\\.nuget\\packages\\microsoft.windows.sdk.net.ref\\10.0.18362.28\\microsoft.windows.sdk.net.ref.10.0.18362.28.nupkg.sha512"
+    "C:\\Users\\Yoojun\\.nuget\\packages\\microsoft.windows.sdk.net.ref\\10.0.18362.31\\microsoft.windows.sdk.net.ref.10.0.18362.31.nupkg.sha512"
   ],
   "logs": []
 }
diff --git a/source/iNKORE.UI.WPF/ColorPicker/PortableColorPicker.xaml b/source/iNKORE.UI.WPF/ColorPicker/PortableColorPicker.xaml
@@ -32,7 +32,7 @@
         </Border>
         <Popup Name="popup" StaysOpen="False" IsOpen="{Binding Path=IsChecked, ElementName=toggleButton, Mode=TwoWay}" Closed="popup_Closed">
             <Border BorderThickness="1" BorderBrush="Black" Background="White">
-                <local:StandardColorPicker ColorState="{Binding ElementName=uc, Path=ColorState, Mode=TwoWay}" x:Name="test"
+                <local:StandardColorPickerOptimized ColorState="{Binding ElementName=uc, Path=ColorState, Mode=TwoWay}" x:Name="test"
                                            UseHintColor="{Binding ElementName=uc, Path=UseHintColor, Mode=TwoWay}"
                                            HintColorState="{Binding ElementName=uc, Path=HintColorState, Mode=TwoWay}"
                                            SecondColorState="{Binding ElementName=uc, Path=SecondColorState, Mode=TwoWay}"