Merge branch 'New-New-Settings' into beta

2026-04-05 19:35:17 +08:00
parent d80a59556e 002970921d
commit e6b707ea51
87 changed files with 6994 additions and 18770 deletions
@@ -263,7 +263,7 @@
                            ToolTipText="InkCanvasForClass"
                            ContextMenu="{StaticResource SysTrayMenu}"
                            IconSource="/Resources/icc.ico"/>
-                <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary.MergedDictionaries>
                <ui:ThemeResources/>
                <ui:XamlControlsResources />
                <ResourceDictionary Source="Resources/SeewoImageDictionary.xaml"/>