test/atomui
1
0
Fork 0
mirror of https://gitee.com/chinware/atomui.git synced 2024-11-29 18:38:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

RangePicker 当前激活指示器的完成

Browse Source 
RangePicker 当前激活指示器的完成
This commit is contained in:
polarboy 2024-09-05 11:56:54 +08:00
parent c396395854
commit adf578ca0a
3 changed files with 123 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedBox.cs
View File

@ -216,9 +216,6 @@ public class AddOnDecoratedBox : ContentControl
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
TokenResourceBinder.CreateGlobalResourceBinding(this, BorderThicknessProperty, GlobalTokenResourceKey.BorderThickness,
BindingPriority.Template,
new RenderScaleAwareThicknessConfigure(this));
_leftAddOnPresenter = e.NameScope.Find<Control>(AddOnDecoratedBoxTheme.LeftAddOnPart);
_rightAddOnPresenter = e.NameScope.Find<Control>(AddOnDecoratedBoxTheme.RightAddOnPart);
SetupInnerBoxCornerRadius();
@ -251,6 +248,14 @@ public class AddOnDecoratedBox : ContentControl
NotifyAddOnBorderInfoCalculated();
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
TokenResourceBinder.CreateGlobalResourceBinding(this, BorderThicknessProperty, GlobalTokenResourceKey.BorderThickness,
BindingPriority.Template,
new RenderScaleAwareThicknessConfigure(this));
}
protected virtual void NotifyAddOnBorderInfoCalculated()
{
}

93
src/AtomUI.Controls/TimePicker/RangeTimePicker.cs
View File

@ -1,8 +1,11 @@
using AtomUI.Data;
using AtomUI.Theme.Utils;
using Avalonia;
using Avalonia.Animation;
using Avalonia.Controls;
using Avalonia.Controls.Diagnostics;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Shapes;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Input.Raw;
@ -234,12 +237,31 @@ public class RangeTimePicker : TemplatedControl
set => SetAndRaise(RangeActivatedPartProperty, ref _rangeActivatedPart, value);
}
internal static readonly StyledProperty<double> PickerIndicatorOffsetXProperty =
AvaloniaProperty.Register<RangeTimePicker, double>(nameof(PickerIndicatorOffsetX), Double.NaN);
internal double PickerIndicatorOffsetX
{
get => GetValue(PickerIndicatorOffsetXProperty);
set => SetValue(PickerIndicatorOffsetXProperty, value);
}
internal static readonly StyledProperty<double> PickerIndicatorOffsetYProperty =
AvaloniaProperty.Register<RangeTimePicker, double>(nameof(PickerIndicatorOffsetY));
internal double PickerIndicatorOffsetY
{
get => GetValue(PickerIndicatorOffsetYProperty);
set => SetValue(PickerIndicatorOffsetYProperty, value);
}
#endregion
private AddOnDecoratedBox? _decoratedBox;
private PickerClearUpButton? _pickerClearUpButton;
private readonly FlyoutStateHelper _flyoutStateHelper;
private RangeTimePickerFlyout? _pickerFlyout;
private Rectangle? _rangePickerIndicator;
private TextBox? _rangeStartTextBox;
private TextBox? _rangeEndTextBox;
private bool _currentValidSelected;
@ -250,6 +272,7 @@ public class RangeTimePicker : TemplatedControl
{
HorizontalAlignmentProperty.OverrideDefaultValue<RangeTimePicker>(HorizontalAlignment.Left);
VerticalAlignmentProperty.OverrideDefaultValue<RangeTimePicker>(VerticalAlignment.Top);
AffectsArrange<RangeTimePicker>(PickerIndicatorOffsetXProperty, PickerIndicatorOffsetYProperty);
}
public RangeTimePicker()
@ -377,16 +400,23 @@ public class RangeTimePicker : TemplatedControl
protected override Size ArrangeOverride(Size finalSize)
{
var borderThickness = _decoratedBox?.BorderThickness ?? default;
return base.ArrangeOverride(finalSize).Inflate(borderThickness);
var size = base.ArrangeOverride(finalSize).Inflate(borderThickness);
if (_rangePickerIndicator is not null) {
Canvas.SetLeft(_rangePickerIndicator, PickerIndicatorOffsetX);
Canvas.SetTop(_rangePickerIndicator, PickerIndicatorOffsetY);
}
return size;
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
_decoratedBox = e.NameScope.Get<AddOnDecoratedBox>(RangeTimePickerTheme.DecoratedBoxPart);
base.OnApplyTemplate(e);
_decoratedBox = e.NameScope.Get<AddOnDecoratedBox>(RangeTimePickerTheme.DecoratedBoxPart);
_rangeStartTextBox = e.NameScope.Get<TextBox>(RangeTimePickerTheme.RangeStartTextBoxPart);
_rangeEndTextBox = e.NameScope.Get<TextBox>(RangeTimePickerTheme.RangeEndTextBoxPart);
_rangePickerIndicator = e.NameScope.Get<Rectangle>(RangeTimePickerTheme.RangePickerIndicatorPart);
_rangePickerInner = e.NameScope.Get<AddOnDecoratedInnerBox>(RangeTimePickerTheme.RangePickerInnerPart);
if (InnerRightContent is null) {
_pickerClearUpButton = new PickerClearUpButton();
@ -405,6 +435,45 @@ public class RangeTimePicker : TemplatedControl
_flyoutStateHelper.AnchorTarget = _rangePickerInner;
SetupFlyoutProperties();
if (_rangePickerIndicator.Transitions is null) {
_rangePickerIndicator.Transitions = new Transitions()
{
AnimationUtils.CreateTransition<DoubleTransition>(Rectangle.OpacityProperty),
AnimationUtils.CreateTransition<DoubleTransition>(Rectangle.OpacityProperty)
};
}
if (Transitions is null) {
Transitions = new Transitions()
{
AnimationUtils.CreateTransition<DoubleTransition>(PickerIndicatorOffsetXProperty)
};
}
}
private void SetupPickerIndicatorPosition()
{
if (_rangePickerIndicator is null ||
_decoratedBox is null ||
_rangeStartTextBox is null ||
_rangeEndTextBox is null) {
return;
}
if (_rangeActivatedPart == RangeActivatedPart.None) {
_rangePickerIndicator.Opacity = 0;
} else if (_rangeActivatedPart == RangeActivatedPart.Start) {
_rangePickerIndicator.Opacity = 1;
_rangePickerIndicator.Width = _rangeStartTextBox.Bounds.Width;
var offset = _rangeStartTextBox.TranslatePoint(new Point(0, 0), this) ?? default;
PickerIndicatorOffsetX = offset.X;
} else if (_rangeActivatedPart == RangeActivatedPart.End) {
_rangePickerIndicator.Opacity = 1;
_rangePickerIndicator.Width = _rangeEndTextBox.Bounds.Width;
var offset = _rangeEndTextBox.TranslatePoint(new Point(0, 0), this) ?? default;
PickerIndicatorOffsetX = offset.X;
}
}
protected void SetupFlyoutProperties()
@ -468,6 +537,22 @@ public class RangeTimePicker : TemplatedControl
}
}
protected override Size MeasureOverride(Size availableSize)
{
var size = base.MeasureOverride(availableSize);
if (_decoratedBox is not null) {
PickerIndicatorOffsetY = _decoratedBox.DesiredSize.Height - _rangePickerIndicator!.Height;
}
if (double.IsNaN(PickerIndicatorOffsetX)) {
if (_rangeActivatedPart == RangeActivatedPart.None) {
var offset = _rangeStartTextBox!.TranslatePoint(new Point(0, 0), this) ?? default;
PickerIndicatorOffsetX = offset.X;
}
}
return size;
}
private void HandleRangeActivatedPartChanged()
{
if (_rangeActivatedPart == RangeActivatedPart.Start) {
@ -475,6 +560,8 @@ public class RangeTimePicker : TemplatedControl
} else if (_rangeActivatedPart == RangeActivatedPart.End) {
PickerPlacement = PlacementMode.BottomEdgeAlignedRight;
}
SetupPickerIndicatorPosition();
}
internal void NotifyConfirmed(TimeSpan value)

43
src/AtomUI.Controls/TimePicker/RangeTimePickerTheme.cs
View File

@ -26,13 +26,18 @@ internal class RangeTimePickerTheme : BaseControlTheme
protected override IControlTemplate BuildControlTemplate()
{
return new FuncControlTemplate<RangeTimePicker>((buttonSpinner, scope) =>
return new FuncControlTemplate<RangeTimePicker>((rangeTimePicker, scope) =>
{
var decoratedBox = BuildRangePickerDecoratedBox(buttonSpinner, scope);
var innerBox = BuildPickerContent(buttonSpinner, scope);
var indicatorLayout = new Panel();
var canvas = new Canvas();
var decoratedBox = BuildRangePickerDecoratedBox(rangeTimePicker, scope);
var innerBox = BuildPickerContent(rangeTimePicker, scope);
var pickerIndicator = BuildPickerIndicator(rangeTimePicker, scope);
canvas.Children.Add(pickerIndicator);
decoratedBox.Content = innerBox;
innerBox.RegisterInNameScope(scope);
return decoratedBox;
indicatorLayout.Children.Add(decoratedBox);
indicatorLayout.Children.Add(canvas);
return indicatorLayout;
});
}
@ -52,20 +57,21 @@ internal class RangeTimePickerTheme : BaseControlTheme
return decoratedBox;
}
protected virtual AddOnDecoratedInnerBox BuildPickerContent(RangeTimePicker rangeTimePicker, INameScope scope)
private AddOnDecoratedInnerBox BuildPickerContent(RangeTimePicker rangeTimePicker, INameScope scope)
{
var rangePickerInnerBox = new AddOnDecoratedInnerBox
{
Name = RangePickerInnerPart,
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalContentAlignment = VerticalAlignment.Stretch
};
rangePickerInnerBox.RegisterInNameScope(scope);
CreateTemplateParentBinding(rangePickerInnerBox, ButtonSpinnerInnerBox.LeftAddOnContentProperty, RangeTimePicker.InnerLeftContentProperty);
CreateTemplateParentBinding(rangePickerInnerBox, ButtonSpinnerInnerBox.RightAddOnContentProperty, RangeTimePicker.InnerRightContentProperty);
CreateTemplateParentBinding(rangePickerInnerBox, ButtonSpinnerInnerBox.StyleVariantProperty, RangeTimePicker.StyleVariantProperty);
CreateTemplateParentBinding(rangePickerInnerBox, ButtonSpinnerInnerBox.StatusProperty, RangeTimePicker.StatusProperty);
CreateTemplateParentBinding(rangePickerInnerBox, ButtonSpinnerInnerBox.SizeTypeProperty, RangeTimePicker.SizeTypeProperty);
var indicatorLayout = new Panel();
var rangeLayout = new Grid()
{
ColumnDefinitions = new ColumnDefinitions()
@ -103,17 +109,20 @@ internal class RangeTimePickerTheme : BaseControlTheme
Grid.SetColumn(arrowIcon, 1);
Grid.SetColumn(rangeEndTextBox, 2);
indicatorLayout.Children.Add(rangeLayout);
rangePickerInnerBox.Content = rangeLayout;
return rangePickerInnerBox;
}
private Rectangle BuildPickerIndicator(RangeTimePicker rangeTimePicker, INameScope scope)
{
var indicator = new Rectangle()
{
Name = RangePickerIndicatorPart,
Opacity = 0
};
rangeLayout.Children.Add(indicator);
rangePickerInnerBox.Content = indicatorLayout;
return rangePickerInnerBox;
indicator.RegisterInNameScope(scope);
return indicator;
}
private TextBox BuildPickerTextBox(string name)
@ -174,7 +183,6 @@ internal class RangeTimePickerTheme : BaseControlTheme
{
var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(RangePickerIndicatorPart));
indicatorStyle.Add(Rectangle.HeightProperty, TimePickerTokenResourceKey.RangePickerIndicatorThickness);
commonStyle.Add(indicatorStyle);
}
@ -186,13 +194,13 @@ internal class RangeTimePickerTheme : BaseControlTheme
defaultStyle.Add(indicatorStyle);
}
commonStyle.Add(defaultStyle);
var errorStyle = new Style(selector => selector.Nesting().PropertyEquals(AddOnDecoratedInnerBox.StatusProperty, AddOnDecoratedStatus.Error));
{
var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(RangePickerIndicatorPart));
indicatorStyle.Add(Rectangle.FillProperty, GlobalTokenResourceKey.ColorError);
errorStyle.Add(indicatorStyle);
}
@ -203,7 +211,6 @@ internal class RangeTimePickerTheme : BaseControlTheme
{
var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(RangePickerIndicatorPart));
indicatorStyle.Add(Rectangle.FillProperty, GlobalTokenResourceKey.ColorWarning);
warningStyle.Add(indicatorStyle);
}