chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

combine xaml

Browse Source 
virtues:
1. 2 or 3 times layout speed
2. smaller dll
This commit is contained in:
NaBian committed 2020-12-01 23:23:22 +08:00
1 parent 3c2154d3ac
commit f835f25165
44 files changed
+27232 -696
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+40 -27
View File
@@ -18,32 +18,6 @@
<Version>3.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Page Update="Themes\Styles\Base\ComboBoxBaseStyle.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Update="Themes\Styles\Base\TreeViewBaseStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Update="Themes\Styles\DataGrid.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Update="Themes\Styles\ListView.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Update="Themes\Styles\MessageBox.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
<Page Update="Themes\Styles\Window.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Shared\HandyControl_Shared\Properties\Langs\Lang.Designer.cs">
<Link>Properties\Langs\Lang.Designer.cs</Link>
@@ -172,7 +146,7 @@
<Link>Resources\Images\GlowWindow\topright.png</Link>
</Resource>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\Base\CheckComboBoxBaseStyle.xaml" />
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\Base\ComboBoxBaseStyle.xaml" />
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\Base\TreeViewBaseStyle.xaml" />
@@ -180,5 +154,44 @@
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\ListView.xaml" />
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\MessageBox.xaml" />
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Styles\Window.xaml" />
<Page Remove="..\..\Shared\HandyControl_Shared\Themes\Theme.xaml" />
<Page Remove="Themes\Styles\Base\CheckComboBoxBaseStyle.xaml" />
<Page Remove="Themes\Styles\Base\ComboBoxBaseStyle.xaml" />
<Page Remove="Themes\Styles\Base\TreeViewBaseStyle.xaml" />
<Page Remove="Themes\Styles\DataGrid.xaml" />
<Page Remove="Themes\Styles\ListView.xaml" />
<Page Remove="Themes\Styles\MessageBox.xaml" />
<Page Remove="Themes\Styles\Window.xaml" />
<Page Remove="Themes\Theme.xaml" />
</ItemGroup>
<ItemGroup>
<None Include="Themes\Styles\Base\CheckComboBoxBaseStyle.xaml" />
<None Include="Themes\Styles\Base\ComboBoxBaseStyle.xaml">
<SubType>Designer</SubType>
<Generator>XamlIntelliSenseFileGenerator</Generator>
</None>
<None Include="Themes\Styles\Base\TreeViewBaseStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Styles\DataGrid.xaml">
<SubType>Designer</SubType>
</None>
<None Include="Themes\Styles\ListView.xaml">
<SubType>Designer</SubType>
</None>
<None Include="Themes\Styles\MessageBox.xaml">
<SubType>Designer</SubType>
</None>
<None Include="Themes\Styles\Window.xaml">
<SubType>Designer</SubType>
</None>
<Page Include="Themes\Theme.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="..\..\Shared\HandyControl_Shared\Themes\XamlCombine.exe ..\..\Shared\HandyControl_Shared\Themes\Theme_GE45.txt Theme.xaml" />
</Target>
</Project>
src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:hc="clr-namespace:HandyControl.Controls"
xmlns:ex="clr-namespace:HandyControl.Tools.Extension"
xmlns:themes="clr-namespace:HandyControl.Themes"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
xmlns:langs="clr-namespace:HandyControl.Properties.Langs">
src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+1 -1
View File
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="clr-namespace:HandyControl.Controls"
xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:themes="clr-namespace:HandyControl.Themes">
<ResourceDictionary.MergedDictionaries>
src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+1 -1
View File
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="clr-namespace:HandyControl.Controls"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:themes="clr-namespace:HandyControl.Themes">
<ResourceDictionary.MergedDictionaries>
src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
+1 -1
View File
@@ -9,7 +9,7 @@
<themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Styles/Window.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
<Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
<Setter Property="MinWidth" Value="88"/>
<Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}"/>
<Setter Property="Margin" Value="5,0"/>
src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+13167
View File
File diff suppressed because it is too large. Load diff