From 217b66fb55578caf66152133e738af0f0d43c49b Mon Sep 17 00:00:00 2001 From: SlimeNull Date: Wed, 17 Apr 2024 16:09:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A0=E5=85=A5=20"=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E9=A3=8E=E6=A0=BC"=20=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EleCho.WpfSuite.SimpleDesign/AssemblyInfo.cs | 3 + .../EleCho.WpfSuite.SimpleDesign.csproj | 35 ++++++++ .../SimpleDesignResources.cs | 13 +++ .../SimpleDesignResources.xaml | 33 ++++++++ EleCho.WpfSuite.sln | 6 ++ EleCho.WpfSuite/EleCho.WpfSuite.csproj | 1 + WpfTest/App.xaml | 3 + WpfTest/MainWindow.xaml | 8 +- WpfTest/Tests/CollectionTestPage.xaml | 7 +- WpfTest/Tests/ConditionalControlTestPage.xaml | 4 +- WpfTest/Tests/PanelsTestPage.xaml | 83 ++++++++++--------- WpfTest/WpfTest.csproj | 1 + 12 files changed, 144 insertions(+), 53 deletions(-) create mode 100644 EleCho.WpfSuite.SimpleDesign/AssemblyInfo.cs create mode 100644 EleCho.WpfSuite.SimpleDesign/EleCho.WpfSuite.SimpleDesign.csproj create mode 100644 EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.cs create mode 100644 EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.xaml diff --git a/EleCho.WpfSuite.SimpleDesign/AssemblyInfo.cs b/EleCho.WpfSuite.SimpleDesign/AssemblyInfo.cs new file mode 100644 index 0000000..a4bcf89 --- /dev/null +++ b/EleCho.WpfSuite.SimpleDesign/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Windows.Markup; + +[assembly: XmlnsDefinition("https://github.com/OrgEleCho/EleCho.WpfSuite/SimpleDesign", "EleCho.WpfSuite.SimpleDesign")] \ No newline at end of file diff --git a/EleCho.WpfSuite.SimpleDesign/EleCho.WpfSuite.SimpleDesign.csproj b/EleCho.WpfSuite.SimpleDesign/EleCho.WpfSuite.SimpleDesign.csproj new file mode 100644 index 0000000..77065fb --- /dev/null +++ b/EleCho.WpfSuite.SimpleDesign/EleCho.WpfSuite.SimpleDesign.csproj @@ -0,0 +1,35 @@ + + + + net8.0-windows;net6.0-windows;net48;net47;net46;net45 + enable + latest + true + true + EleCho.WpfSuite + + 0.0.1 + + EleCho + Copyright © 2024 EleCho + https://github.com/OrgEleCho/EleCho.WpfSuite + logo.png + WPF;MVVM;Toolkit;Controls;Converters;BindingProxy + WPF layout panels, controls, value converters, utilities suite + MIT + README.md + + + + + + + + + + + + + + + diff --git a/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.cs b/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.cs new file mode 100644 index 0000000..ee71ebe --- /dev/null +++ b/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.cs @@ -0,0 +1,13 @@ +using System; +using System.Windows; + +namespace EleCho.WpfSuite.SimpleDesign +{ + public class SimpleDesignResources : ResourceDictionary + { + public SimpleDesignResources() + { + MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri("pack://application:,,,/EleCho.WpfSuite.SimpleDesign;component/SimpleDesignResources.xaml") }); + } + } +} diff --git a/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.xaml b/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.xaml new file mode 100644 index 0000000..cefa4d3 --- /dev/null +++ b/EleCho.WpfSuite.SimpleDesign/SimpleDesignResources.xaml @@ -0,0 +1,33 @@ + + + SimpleDesign + + + + + + + + + + + + \ No newline at end of file diff --git a/EleCho.WpfSuite.sln b/EleCho.WpfSuite.sln index 1d32c87..515b253 100644 --- a/EleCho.WpfSuite.sln +++ b/EleCho.WpfSuite.sln @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决 README.md = README.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EleCho.WpfSuite.SimpleDesign", "EleCho.WpfSuite.SimpleDesign\EleCho.WpfSuite.SimpleDesign.csproj", "{EAD122E7-549D-4057-83C4-DCD2A04E4481}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -26,6 +28,10 @@ Global {8F0B4AE1-61E7-44A7-9FDA-C17D37EECC7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F0B4AE1-61E7-44A7-9FDA-C17D37EECC7A}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F0B4AE1-61E7-44A7-9FDA-C17D37EECC7A}.Release|Any CPU.Build.0 = Release|Any CPU + {EAD122E7-549D-4057-83C4-DCD2A04E4481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EAD122E7-549D-4057-83C4-DCD2A04E4481}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EAD122E7-549D-4057-83C4-DCD2A04E4481}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EAD122E7-549D-4057-83C4-DCD2A04E4481}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/EleCho.WpfSuite/EleCho.WpfSuite.csproj b/EleCho.WpfSuite/EleCho.WpfSuite.csproj index b3d85d4..9d24597 100644 --- a/EleCho.WpfSuite/EleCho.WpfSuite.csproj +++ b/EleCho.WpfSuite/EleCho.WpfSuite.csproj @@ -6,6 +6,7 @@ latest true true + EleCho.WpfSuite 0.1.2 diff --git a/WpfTest/App.xaml b/WpfTest/App.xaml index 5ccf364..509ab9d 100644 --- a/WpfTest/App.xaml +++ b/WpfTest/App.xaml @@ -1,12 +1,15 @@  + diff --git a/WpfTest/MainWindow.xaml b/WpfTest/MainWindow.xaml index f31e674..e4ada4f 100644 --- a/WpfTest/MainWindow.xaml +++ b/WpfTest/MainWindow.xaml @@ -22,15 +22,9 @@ DockPanel.Dock="Left" Width="180" BorderThickness="0 0 1 0" - CornerRadius="0 5 5 0" ItemsSource="{Binding NavigationItems}" d:ItemsSource="{d:SampleData ItemCount=3}" SelectionChanged="ListBox_SelectionChanged"> - - - @@ -42,7 +36,7 @@ diff --git a/WpfTest/Tests/CollectionTestPage.xaml b/WpfTest/Tests/CollectionTestPage.xaml index fd981e5..f595f22 100644 --- a/WpfTest/Tests/CollectionTestPage.xaml +++ b/WpfTest/Tests/CollectionTestPage.xaml @@ -30,9 +30,9 @@ HorizontalAlignment="Left" Spacing="8"> + Padding="5 3"/> + Padding="5 3"/> @@ -75,7 +74,6 @@ @@ -98,7 +96,6 @@ diff --git a/WpfTest/Tests/ConditionalControlTestPage.xaml b/WpfTest/Tests/ConditionalControlTestPage.xaml index 1f58658..f2051f6 100644 --- a/WpfTest/Tests/ConditionalControlTestPage.xaml +++ b/WpfTest/Tests/ConditionalControlTestPage.xaml @@ -44,7 +44,7 @@ @@ -66,7 +66,7 @@ + CornerRadius="4"/> -