diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs index 5810e294..88f31e5d 100644 --- a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs +++ b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs @@ -42,9 +42,6 @@ namespace HandyControl.Controls public static Brush GetBorderBrush(DependencyObject element) => (Brush) element.GetValue(BorderBrushProperty); - /// - /// 标题对齐方式 - /// public static readonly DependencyProperty TitlePlacementProperty = DependencyProperty.RegisterAttached( "TitlePlacement", typeof(TitlePlacementType), typeof(TitleElement), new FrameworkPropertyMetadata(TitlePlacementType.Top, FrameworkPropertyMetadataOptions.Inherits)); @@ -54,14 +51,29 @@ namespace HandyControl.Controls public static TitlePlacementType GetTitlePlacement(DependencyObject element) => (TitlePlacementType) element.GetValue(TitlePlacementProperty); - /// - /// 标题宽度 - /// public static readonly DependencyProperty TitleWidthProperty = DependencyProperty.RegisterAttached( - "TitleWidth", typeof(GridLength), typeof(TitleElement), new FrameworkPropertyMetadata(new GridLength(120.0), FrameworkPropertyMetadataOptions.Inherits)); + "TitleWidth", typeof(GridLength), typeof(TitleElement), new FrameworkPropertyMetadata(GridLength.Auto, FrameworkPropertyMetadataOptions.Inherits)); public static void SetTitleWidth(DependencyObject element, GridLength value) => element.SetValue(TitleWidthProperty, value); public static GridLength GetTitleWidth(DependencyObject element) => (GridLength)element.GetValue(TitleWidthProperty); + + public static readonly DependencyProperty HorizontalAlignmentProperty = DependencyProperty.RegisterAttached( + "HorizontalAlignment", typeof(HorizontalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(HorizontalAlignment), FrameworkPropertyMetadataOptions.Inherits)); + + public static void SetHorizontalAlignment(DependencyObject element, HorizontalAlignment value) + => element.SetValue(HorizontalAlignmentProperty, value); + + public static HorizontalAlignment GetHorizontalAlignment(DependencyObject element) + => (HorizontalAlignment) element.GetValue(HorizontalAlignmentProperty); + + public static readonly DependencyProperty VerticalAlignmentProperty = DependencyProperty.RegisterAttached( + "VerticalAlignment", typeof(VerticalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(VerticalAlignment), FrameworkPropertyMetadataOptions.Inherits)); + + public static void SetVerticalAlignment(DependencyObject element, VerticalAlignment value) + => element.SetValue(VerticalAlignmentProperty, value); + + public static VerticalAlignment GetVerticalAlignment(DependencyObject element) + => (VerticalAlignment) element.GetValue(VerticalAlignmentProperty); } } \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml index 36fbaf87..82c868d2 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml @@ -76,10 +76,10 @@ - - - - + + + + @@ -105,10 +105,10 @@ - - - - + + + + @@ -157,10 +157,10 @@ - - - - + + + + @@ -217,10 +217,10 @@ - - - - + + + +