diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml index 4ef5f7f..f06ee98 100644 --- a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml +++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml @@ -153,7 +153,7 @@ diff --git a/demo/Ursa.Demo/Pages/TimelineDemo.axaml b/demo/Ursa.Demo/Pages/TimelineDemo.axaml index fcf8af2..262ac3e 100644 --- a/demo/Ursa.Demo/Pages/TimelineDemo.axaml +++ b/demo/Ursa.Demo/Pages/TimelineDemo.axaml @@ -59,27 +59,27 @@ diff --git a/src/Ursa/Controls/Timeline/Timeline.cs b/src/Ursa/Controls/Timeline/Timeline.cs index 811911b..a318a58 100644 --- a/src/Ursa/Controls/Timeline/Timeline.cs +++ b/src/Ursa/Controls/Timeline/Timeline.cs @@ -176,21 +176,21 @@ public class Timeline: ItemsControl { foreach (var item in items) { - SetIfUnset(item, TimelineItem.ModeProperty, TimelineItemDisplayMode.Left); + SetIfUnset(item, TimelineItem.PositionProperty, TimelineItemPosition.Left); } } else if (Mode == TimelineDisplayMode.Right) { foreach (var item in items) { - SetIfUnset(item, TimelineItem.ModeProperty, TimelineItemDisplayMode.Right); + SetIfUnset(item, TimelineItem.PositionProperty, TimelineItemPosition.Right); } } else if (Mode == TimelineDisplayMode.Center) { foreach (var item in items) { - SetIfUnset(item, TimelineItem.ModeProperty, TimelineItemDisplayMode.Separate); + SetIfUnset(item, TimelineItem.PositionProperty, TimelineItemPosition.Separate); } } else if (Mode == TimelineDisplayMode.Alternate) @@ -200,11 +200,11 @@ public class Timeline: ItemsControl { if (left) { - SetIfUnset(item, TimelineItem.ModeProperty, TimelineItemDisplayMode.Left); + SetIfUnset(item, TimelineItem.PositionProperty, TimelineItemPosition.Left); } else { - SetIfUnset(item, TimelineItem.ModeProperty, TimelineItemDisplayMode.Right); + SetIfUnset(item, TimelineItem.PositionProperty, TimelineItemPosition.Right); } left = !left; } diff --git a/src/Ursa/Controls/Timeline/TimelineDisplayMode.cs b/src/Ursa/Controls/Timeline/TimelineDisplayMode.cs index dcbad75..ec01a90 100644 --- a/src/Ursa/Controls/Timeline/TimelineDisplayMode.cs +++ b/src/Ursa/Controls/Timeline/TimelineDisplayMode.cs @@ -14,7 +14,7 @@ public enum TimelineDisplayMode /// Right means line is placed right to TimelineItem content. /// Separate means line is placed between TimelineItem content and time. /// -public enum TimelineItemDisplayMode +public enum TimelineItemPosition { Left, Right, diff --git a/src/Ursa/Controls/Timeline/TimelineItem.cs b/src/Ursa/Controls/Timeline/TimelineItem.cs index dcbae01..9eecece 100644 --- a/src/Ursa/Controls/Timeline/TimelineItem.cs +++ b/src/Ursa/Controls/Timeline/TimelineItem.cs @@ -62,13 +62,13 @@ public class TimelineItem: HeaderedContentControl set => SetValue(TypeProperty, value); } - public static readonly StyledProperty ModeProperty = AvaloniaProperty.Register( - nameof(Mode), defaultValue: TimelineItemDisplayMode.Right); + public static readonly StyledProperty PositionProperty = AvaloniaProperty.Register( + nameof(Position), defaultValue: TimelineItemPosition.Right); - public TimelineItemDisplayMode Mode + public TimelineItemPosition Position { - get => GetValue(ModeProperty); - set => SetValue(ModeProperty, value); + get => GetValue(PositionProperty); + set => SetValue(PositionProperty, value); } public static readonly DirectProperty LeftWidthProperty = AvaloniaProperty.RegisterDirect( @@ -119,20 +119,20 @@ public class TimelineItem: HeaderedContentControl static TimelineItem() { IconProperty.Changed.AddClassHandler((item, args) => { item.OnIconChanged(args); }); - ModeProperty.Changed.AddClassHandler((item, args) => { item.OnModeChanged(args); }); + PositionProperty.Changed.AddClassHandler((item, args) => { item.OnModeChanged(args); }); AffectsMeasure(LeftWidthProperty, RightWidthProperty, IconWidthProperty); } - private void OnModeChanged(AvaloniaPropertyChangedEventArgs args) + private void OnModeChanged(AvaloniaPropertyChangedEventArgs args) { SetMode(args.NewValue.Value); } - private void SetMode(TimelineItemDisplayMode mode) + private void SetMode(TimelineItemPosition mode) { - PseudoClasses.Set(PC_AllLeft, mode == TimelineItemDisplayMode.Left); - PseudoClasses.Set(PC_AllRight, mode == TimelineItemDisplayMode.Right); - PseudoClasses.Set(PC_Separate, mode == TimelineItemDisplayMode.Separate); + PseudoClasses.Set(PC_AllLeft, mode == TimelineItemPosition.Left); + PseudoClasses.Set(PC_AllRight, mode == TimelineItemPosition.Right); + PseudoClasses.Set(PC_Separate, mode == TimelineItemPosition.Separate); } protected override void OnApplyTemplate(TemplateAppliedEventArgs e) @@ -144,7 +144,7 @@ public class TimelineItem: HeaderedContentControl _contentPresenter = e.NameScope.Find(PART_Content); _timePresenter = e.NameScope.Find(PART_Time); PseudoClasses.Set(PC_EmptyIcon, Icon is null); - SetMode(Mode); + SetMode(Position); } private void OnIconChanged(AvaloniaPropertyChangedEventArgs args) @@ -166,17 +166,17 @@ public class TimelineItem: HeaderedContentControl double content = _contentPresenter?.DesiredSize.Width ?? 0; double time = _timePresenter?.DesiredSize.Width ?? 0; double max = Math.Max(header, content); - if (Mode == TimelineItemDisplayMode.Left) + if (Position == TimelineItemPosition.Left) { max = Math.Max(max, time); return (0, icon, max); } - if (Mode == TimelineItemDisplayMode.Right) + if (Position == TimelineItemPosition.Right) { max = Math.Max(max, time); return (max , icon, 0); } - if (Mode == TimelineItemDisplayMode.Separate) + if (Position == TimelineItemPosition.Separate) { return (time, icon, max); }