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

rename TitleAlignment to TitlePlacementType

Browse Source
This commit is contained in:
NaBian committed 2020-06-05 20:37:34 +08:00
1 parent a7857be610
commit 8e34fc1d29
28 files changed
+86 -86
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
+6 -6
View File
@@ -45,14 +45,14 @@ namespace HandyControl.Controls
/// <summary>
/// 标题对齐方式
/// </summary>
public static readonly DependencyProperty TitleAlignmentProperty = DependencyProperty.RegisterAttached(
"TitleAlignment", typeof(TitleAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(TitleAlignment.Top, FrameworkPropertyMetadataOptions.Inherits));
public static readonly DependencyProperty TitlePlacementProperty = DependencyProperty.RegisterAttached(
"TitlePlacement", typeof(TitlePlacementType), typeof(TitleElement), new FrameworkPropertyMetadata(TitlePlacementType.Top, FrameworkPropertyMetadataOptions.Inherits));
public static void SetTitleAlignment(DependencyObject element, TitleAlignment value)
=> element.SetValue(TitleAlignmentProperty, value);
public static void SetTitlePlacement(DependencyObject element, TitlePlacementType value)
=> element.SetValue(TitlePlacementProperty, value);
public static TitleAlignment GetTitleAlignment(DependencyObject element)
=> (TitleAlignment) element.GetValue(TitleAlignmentProperty);
public static TitlePlacementType GetTitlePlacement(DependencyObject element)
=> (TitlePlacementType) element.GetValue(TitlePlacementProperty);
/// <summary>
/// 标题宽度
src/Shared/HandyControl_Shared/Data/Enum/TitleAlignment.cs → src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
+1 -1
View File
@@ -4,7 +4,7 @@ namespace HandyControl.Data
/// <summary>
/// 标题对齐方式
/// </summary>
public enum TitleAlignment
public enum TitlePlacementType
{
Left,
Top
src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+1 -1
View File
@@ -214,7 +214,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\StepStatus.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\TextType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\PlacementType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\TitleAlignment.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Enum\TitlePlacementType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Gif\GifFrameDimension.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Gif\GifImageInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Data\Gif\GifPropertyItem.cs" />
src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+8 -8
View File
@@ -571,21 +571,21 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="False"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Left"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxLeftTemplate}"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Top"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxEditableTopTemplate}"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Left"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxEditableLeftTemplate}"/>
</MultiTrigger>
@@ -1364,21 +1364,21 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="False"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Left"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusLeftTemplate}"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Top"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Top"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Top"/>
<Condition Property="AutoComplete" Value="True"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}"/>
@@ -1386,14 +1386,14 @@
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Left"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}"/>
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsEditable" Value="True"/>
<Condition Property="controls:InfoElement.TitleAlignment" Value="Left"/>
<Condition Property="controls:InfoElement.TitlePlacement" Value="Left"/>
<Condition Property="AutoComplete" Value="True"/>
</MultiTrigger.Conditions>
<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}"/>
src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml
+2 -2
View File
@@ -188,7 +188,7 @@
<Setter Property="controls:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}"/>
<Setter Property="Template" Value="{StaticResource DatePickerExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource DatePickerExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -350,7 +350,7 @@
<Style x:Key="DatePickerPlusBaseStyle" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="controls:DatePicker">
<Setter Property="Template" Value="{StaticResource DatePickerPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource DatePickerPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml
+2 -2
View File
@@ -169,7 +169,7 @@
<Setter Property="controls:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}"/>
<Setter Property="Template" Value="{StaticResource DateTimePickerExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource DateTimePickerExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -331,7 +331,7 @@
<Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="controls:DateTimePicker">
<Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource DateTimePickerPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/GroupBoxBaseStyle.xaml
+4 -4
View File
@@ -49,7 +49,7 @@
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
<Setter Property="controls:TitleElement.Background" Value="{DynamicResource TitleBrush}"/>
<Setter Property="controls:TitleElement.TitleAlignment" Value="Top"/>
<Setter Property="controls:TitleElement.TitlePlacement" Value="Top"/>
<Setter Property="controls:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -57,7 +57,7 @@
<Setter Property="Padding" Value="4"/>
<Setter Property="Template" Value="{StaticResource GroupBoxBaseTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:TitleElement.TitleAlignment" Value="Left">
<Trigger Property="controls:TitleElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource GroupBoxBaseLeftTemplate}"/>
</Trigger>
</Style.Triggers>
@@ -103,7 +103,7 @@
<Setter Property="Padding" Value="0"/>
<Setter Property="Template" Value="{StaticResource GroupBoxOriginalTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:TitleElement.TitleAlignment" Value="Left">
<Trigger Property="controls:TitleElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource GroupBoxOriginalLeftTemplate}"/>
</Trigger>
</Style.Triggers>
@@ -148,7 +148,7 @@
<Style x:Key="GroupBoxTabBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
<Setter Property="Template" Value="{StaticResource GroupBoxTabTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:TitleElement.TitleAlignment" Value="Left">
<Trigger Property="controls:TitleElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource GroupBoxTabLeftTemplate}"/>
</Trigger>
</Style.Triggers>
src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
+2 -2
View File
@@ -149,7 +149,7 @@
<Setter Property="Height" Value="Auto"/>
<Setter Property="Template" Value="{StaticResource NumericUpDownExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource NumericUpDownExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -293,7 +293,7 @@
<Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="controls:NumericUpDown">
<Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource NumericUpDownPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
+2 -2
View File
@@ -123,7 +123,7 @@
<Setter Property="controls:PasswordBoxAttach.IsMonitoring" Value="True"/>
<Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource PasswordBoxExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -301,7 +301,7 @@
<Setter Property="Focusable" Value="False"/>
<Setter Property="Template" Value="{StaticResource PasswordBoxPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource PasswordBoxPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml
+2 -2
View File
@@ -116,7 +116,7 @@
<Setter Property="controls:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}"/>
<Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -250,7 +250,7 @@
<Style x:Key="SearchBarPlusBaseStyle" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="controls:SearchBar">
<Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
+2 -2
View File
@@ -135,7 +135,7 @@
<Setter Property="Height" Value="Auto"/>
<Setter Property="Template" Value="{StaticResource TextBoxExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource TextBoxExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -265,7 +265,7 @@
<Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="controls:TextBox">
<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource TextBoxPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml
+2 -2
View File
@@ -169,7 +169,7 @@
<Setter Property="controls:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}"/>
<Setter Property="Template" Value="{StaticResource TimePickerExtendTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource TimePickerExtendLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>
@@ -331,7 +331,7 @@
<Style x:Key="TimePickerPlusBaseStyle" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="controls:TimePicker">
<Setter Property="Template" Value="{StaticResource TimePickerPlusTopTemplate}"/>
<Style.Triggers>
<Trigger Property="controls:InfoElement.TitleAlignment" Value="Left">
<Trigger Property="controls:InfoElement.TitlePlacement" Value="Left">
<Setter Property="Template" Value="{StaticResource TimePickerPlusLeftTemplate}"/>
<Setter Property="Width" Value="Auto"/>
</Trigger>