整理控件库

2025-05-05 17:04:06 +08:00
parent 74532b77be
commit 3eaad7566e
283 changed files with 2156 additions and 17846 deletions
--- a/WPFluent/Resources/Accent.xaml
+++ b/WPFluent/Resources/Accent.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

-    <!--  Colors depending on the theme should be changed by the Manager  -->
+    <!--  管理员应根据主题更改颜色  -->
    <Color x:Key="SystemAccentColor">#3379d9</Color>

-    <!--  While the name remains Light to stay with the official nomenclature, it's made dark in Dark Theme  -->
+    <!--  为了与官方命名保持一致，"Light "的名称仍然保留，但在 "Dark Theme "中则变成了 "dark"。  -->

    <!--  SystemAccentColorDark1 | SystemAccentColorLight1  -->
    <Color x:Key="SystemAccentColorPrimary">#559ce4</Color>
@@ -35,6 +35,5 @@
        Color="{StaticResource SystemAccentColorPrimary}" />
    <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />

-
    <SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
 </ResourceDictionary>
--- a/WPFluent/Resources/DefaultContextMenu.xaml
+++ b/WPFluent/Resources/DefaultContextMenu.xaml
@@ -1,16 +1,7 @@
-<!--
-    This Source Code Form is subject to the terms of the MIT License.
-    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-    All Rights Reserved.
-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ContextMenu x:Key="DefaultControlContextMenu">
        <MenuItem Command="ApplicationCommands.Copy" />
        <MenuItem Command="ApplicationCommands.Cut" />
        <MenuItem Command="ApplicationCommands.Paste" />
    </ContextMenu>
-
 </ResourceDictionary>
--- a/WPFluent/Resources/DesignTime.xaml
+++ b/WPFluent/Resources/DesignTime.xaml
@@ -1,6 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Themes/Light.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
--- a/WPFluent/Resources/Palette.xaml
+++ b/WPFluent/Resources/Palette.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
    This Source Code Form is subject to the terms of the MIT License.
    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -7,10 +7,7 @@

 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

-    <!--
-        A set of a consistent color palette for use inside the application
-        PaletteRedColor is used for TitleBar > Close
-    -->
+    <!-- 一组用于应用程序内部的一致调色板PaletteRedColor 用于 TitleBar > Close -->

    <Color x:Key="PalettePrimaryColor">#333333</Color>
    <Color x:Key="PaletteRedColor">#F44336</Color>
--- a/WPFluent/Resources/Styles.xaml
+++ b/WPFluent/Resources/Styles.xaml
@@ -1,10 +1,4 @@
-<!--
-    This Source Code Form is subject to the terms of the MIT License.
-    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-    All Rights Reserved.
-->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
    <ResourceDictionary.MergedDictionaries>
        <!--Resources-->
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
@@ -16,12 +10,13 @@
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultContextMenu.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultFocusVisualStyle.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/DefaultTextBoxScrollViewerStyle.xaml" />
+        <!--Layout-->
+        
        <!--Controls-->
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/FontIcon/FontIconFallback.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Button/Button.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/AccessText/AccessText.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Anchor/Anchor.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/AutoSuggestBox/AutoSuggestBox.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Badge/Badge.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/BreadcrumbBar/BreadcrumbBar.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Calendar/Calendar.xaml" />
@@ -32,9 +27,9 @@
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CardControl/CardControl.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CardExpander/CardExpander.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CheckBox/CheckBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CheckBox/CheckBox.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CheckComboBox/CheckComboBox.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/ChooseBox/ChooseBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/CodeBlock/CodeBlock.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/ComboBox/ComboBox.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/ComboBoxEx/ComboBoxEx.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/ColorPicker/ColorPicker.xaml" />
@@ -70,11 +65,6 @@
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Menu/MenuLoader.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/MessageBox/MessageBoxDialog.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/MessageWindow/MessageWindow.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NavigationView/NavigationView.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NavigationView/NavigationViewBreadcrumbItem.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NavigationView/NavigationViewContentPresenter.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NavigationView/NavigationViewItemHeader.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NavigationView/NavigationViewItemSeparator.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/NumberBox/NumberBox.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Page/Page.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/PasswordBox/PasswordBox.xaml" />
@@ -87,7 +77,6 @@
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Scroll/ScrollViewer.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Separator/Separator.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Slider/Slider.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/Snackbar/Snackbar.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/SplitButton/SplitButton.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/StatusBar/StatusBar.xaml" />
        <ResourceDictionary Source="pack://application:,,,/WPFluent;component/Controls/TabControl/TabControl.xaml" />
--- a/WPFluent/Resources/Variables.xaml
+++ b/WPFluent/Resources/Variables.xaml
@@ -1,13 +1,4 @@
-<!--
-    This Source Code Form is subject to the terms of the MIT License.
-    If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
-    Copyright (C) Leszek Pomianowski and WPF UI Contributors.
-    All Rights Reserved.
-    
-    Based on Microsoft XAML for Win UI
-    Copyright (c) Microsoft Corporation. All Rights Reserved.
-->
-<ResourceDictionary
+<ResourceDictionary
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -26,7 +17,6 @@
    <Duration x:Key="ControlFastAnimationAfterDuration">00:00:00.168</Duration>
    <Duration x:Key="ControlFasterAnimationDuration">00:00:00.083</Duration>
    -->
-
    <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
    <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
    <Thickness x:Key="TextControlThemePadding">10,8,10,7</Thickness>
@@ -34,22 +24,23 @@
    <system:Double x:Key="ContentControlFontSize">14</system:Double>
    <system:Double x:Key="TextControlThemeMinHeight">24</system:Double>
    <system:Double x:Key="TextControlThemeMinWidth">0</system:Double>
-    <system:Double x:Key="ListViewItemMinHeight">32</system:Double>
+    
    <system:Double x:Key="TreeViewItemMinHeight">24</system:Double>
    <system:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">24</system:Double>
    <system:Double x:Key="TreeViewItemPresenterMargin">0</system:Double>
    <system:Double x:Key="TreeViewItemPresenterPadding">0</system:Double>

    <Thickness x:Key="TimePickerHostPadding">0,1,0,2</Thickness>
+    
    <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
    <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
+    
    <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
-
    <system:Double x:Key="ComboBoxMinHeight">24</system:Double>
    <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
-    <system:Double x:Key="NavigationViewItemOnLeftMinHeight">32</system:Double>
-
+    
    <CornerRadius x:Key="ControlTopCornerRadius">3.5,3.5,0,0</CornerRadius>
+    <!--ColorPicker-->
    <system:Double x:Key="ColorPickerRadius">4</system:Double>
    <Thickness x:Key="ThumbMargin">-5,-5,0,0</Thickness>
    <system:Double x:Key="ThumbSize">10</system:Double>