tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

move IndeterminateStarting/EndingOffset to TemplateSettings.

pull/11555/head
Jumar Macato 3 years ago
parent
1c844a341f
commit
df22fb29bc
2 changed files with 70 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 141
      src/Avalonia.Controls/ProgressBar.cs
  2. 8
      src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml

141
src/Avalonia.Controls/ProgressBar.cs
View File

@ -32,29 +32,33 @@ namespace Avalonia.Controls
private double _container2AnimationStartPosition; private double _container2AnimationStartPosition;
private double _container2AnimationEndPosition; private double _container2AnimationEndPosition;
public static readonly DirectProperty<ProgressBarTemplateSettings, double> ContainerAnimationStartPositionProperty = public static readonly DirectProperty<ProgressBarTemplateSettings, double>
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>( ContainerAnimationStartPositionProperty =
nameof(ContainerAnimationStartPosition), AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
p => p.ContainerAnimationStartPosition, nameof(ContainerAnimationStartPosition),
(p, o) => p.ContainerAnimationStartPosition = o, 0d); p => p.ContainerAnimationStartPosition,
(p, o) => p.ContainerAnimationStartPosition = o);
public static readonly DirectProperty<ProgressBarTemplateSettings, double> ContainerAnimationEndPositionProperty =
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>( public static readonly DirectProperty<ProgressBarTemplateSettings, double>
nameof(ContainerAnimationEndPosition), ContainerAnimationEndPositionProperty =
p => p.ContainerAnimationEndPosition, AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
(p, o) => p.ContainerAnimationEndPosition = o, 0d); nameof(ContainerAnimationEndPosition),
p => p.ContainerAnimationEndPosition,
public static readonly DirectProperty<ProgressBarTemplateSettings, double> Container2AnimationStartPositionProperty = (p, o) => p.ContainerAnimationEndPosition = o);
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
nameof(Container2AnimationStartPosition), public static readonly DirectProperty<ProgressBarTemplateSettings, double>
p => p.Container2AnimationStartPosition, Container2AnimationStartPositionProperty =
(p, o) => p.Container2AnimationStartPosition = o, 0d); AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
nameof(Container2AnimationStartPosition),
public static readonly DirectProperty<ProgressBarTemplateSettings, double> Container2AnimationEndPositionProperty = p => p.Container2AnimationStartPosition,
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>( (p, o) => p.Container2AnimationStartPosition = o);
nameof(Container2AnimationEndPosition),
p => p.Container2AnimationEndPosition, public static readonly DirectProperty<ProgressBarTemplateSettings, double>
(p, o) => p.Container2AnimationEndPosition = o); Container2AnimationEndPositionProperty =
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
nameof(Container2AnimationEndPosition),
p => p.Container2AnimationEndPosition,
(p, o) => p.Container2AnimationEndPosition = o);
public static readonly DirectProperty<ProgressBarTemplateSettings, double> Container2WidthProperty = public static readonly DirectProperty<ProgressBarTemplateSettings, double> Container2WidthProperty =
AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>( AvaloniaProperty.RegisterDirect<ProgressBarTemplateSettings, double>(
@ -68,10 +72,17 @@ namespace Avalonia.Controls
p => p.ContainerWidth, p => p.ContainerWidth,
(p, o) => p.ContainerWidth = o); (p, o) => p.ContainerWidth = o);
public static readonly StyledProperty<double> IndeterminateStartingOffsetProperty =
AvaloniaProperty.Register<ProgressBarTemplateSettings, double>(nameof(IndeterminateStartingOffset));
public static readonly StyledProperty<double> IndeterminateEndingOffsetProperty =
AvaloniaProperty.Register<ProgressBarTemplateSettings, double>(nameof(IndeterminateEndingOffset));
public double ContainerAnimationStartPosition public double ContainerAnimationStartPosition
{ {
get => _containerAnimationStartPosition; get => _containerAnimationStartPosition;
set => SetAndRaise(ContainerAnimationStartPositionProperty, ref _containerAnimationStartPosition, value); set => SetAndRaise(ContainerAnimationStartPositionProperty, ref _containerAnimationStartPosition,
value);
} }
public double ContainerAnimationEndPosition public double ContainerAnimationEndPosition
@ -83,7 +94,8 @@ namespace Avalonia.Controls
public double Container2AnimationStartPosition public double Container2AnimationStartPosition
{ {
get => _container2AnimationStartPosition; get => _container2AnimationStartPosition;
set => SetAndRaise(Container2AnimationStartPositionProperty, ref _container2AnimationStartPosition, value); set => SetAndRaise(Container2AnimationStartPositionProperty, ref _container2AnimationStartPosition,
value);
} }
public double Container2Width public double Container2Width
@ -103,6 +115,18 @@ namespace Avalonia.Controls
get => _container2AnimationEndPosition; get => _container2AnimationEndPosition;
set => SetAndRaise(Container2AnimationEndPositionProperty, ref _container2AnimationEndPosition, value); set => SetAndRaise(Container2AnimationEndPositionProperty, ref _container2AnimationEndPosition, value);
} }
public double IndeterminateStartingOffset
{
get => GetValue(IndeterminateStartingOffsetProperty);
set => SetValue(IndeterminateStartingOffsetProperty, value);
}
public double IndeterminateEndingOffset
{
get => GetValue(IndeterminateEndingOffsetProperty);
set => SetValue(IndeterminateEndingOffsetProperty, value);
}
} }
private double _percentage; private double _percentage;
@ -131,7 +155,7 @@ namespace Avalonia.Controls
/// Defines the <see cref="Orientation"/> property. /// Defines the <see cref="Orientation"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<Orientation> OrientationProperty = public static readonly StyledProperty<Orientation> OrientationProperty =
AvaloniaProperty.Register<ProgressBar, Orientation>(nameof(Orientation), Orientation.Horizontal); AvaloniaProperty.Register<ProgressBar, Orientation>(nameof(Orientation));
/// <summary> /// <summary>
/// Defines the <see cref="Percentage"/> property. /// Defines the <see cref="Percentage"/> property.
@ -141,18 +165,6 @@ namespace Avalonia.Controls
nameof(Percentage), nameof(Percentage),
o => o.Percentage); o => o.Percentage);
/// <summary>
/// Defines the <see cref="IndeterminateStartingOffset"/> property.
/// </summary>
public static readonly StyledProperty<double> IndeterminateStartingOffsetProperty =
AvaloniaProperty.Register<ProgressBar, double>(nameof(IndeterminateStartingOffset));
/// <summary>
/// Defines the <see cref="IndeterminateEndingOffset"/> property.
/// </summary>
public static readonly StyledProperty<double> IndeterminateEndingOffsetProperty =
AvaloniaProperty.Register<ProgressBar, double>(nameof(IndeterminateEndingOffset));
/// <summary> /// <summary>
/// Gets the overall percentage complete of the progress /// Gets the overall percentage complete of the progress
/// </summary> /// </summary>
@ -166,26 +178,14 @@ namespace Avalonia.Controls
private set { SetAndRaise(PercentageProperty, ref _percentage, value); } private set { SetAndRaise(PercentageProperty, ref _percentage, value); }
} }
public double IndeterminateStartingOffset
{
get => GetValue(IndeterminateStartingOffsetProperty);
set => SetValue(IndeterminateStartingOffsetProperty, value);
}
public double IndeterminateEndingOffset
{
get => GetValue(IndeterminateEndingOffsetProperty);
set => SetValue(IndeterminateEndingOffsetProperty, value);
}
static ProgressBar() static ProgressBar()
{ {
ValueProperty.OverrideMetadata<ProgressBar>(new(defaultBindingMode: BindingMode.OneWay)); ValueProperty.OverrideMetadata<ProgressBar>(new(defaultBindingMode: BindingMode.OneWay));
ValueProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e)); ValueProperty.Changed.AddClassHandler<ProgressBar>((x, _) => x.UpdateIndicatorWhenPropChanged());
MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e)); MinimumProperty.Changed.AddClassHandler<ProgressBar>((x, _) => x.UpdateIndicatorWhenPropChanged());
MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e)); MaximumProperty.Changed.AddClassHandler<ProgressBar>((x, _) => x.UpdateIndicatorWhenPropChanged());
IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e)); IsIndeterminateProperty.Changed.AddClassHandler<ProgressBar>((x, _) => x.UpdateIndicatorWhenPropChanged());
OrientationProperty.Changed.AddClassHandler<ProgressBar>((x, e) => x.UpdateIndicatorWhenPropChanged(e)); OrientationProperty.Changed.AddClassHandler<ProgressBar>((x, _) => x.UpdateIndicatorWhenPropChanged());
} }
/// <summary> /// <summary>
@ -305,22 +305,14 @@ namespace Avalonia.Controls
TemplateSettings.Container2AnimationStartPosition = barIndicatorWidth2 * -1.5; // Position at -150% TemplateSettings.Container2AnimationStartPosition = barIndicatorWidth2 * -1.5; // Position at -150%
TemplateSettings.Container2AnimationEndPosition = barIndicatorWidth2 * 1.66; // Position at 166% TemplateSettings.Container2AnimationEndPosition = barIndicatorWidth2 * 1.66; // Position at 166%
// Remove these properties when we switch to fluent as default and removed the old one. TemplateSettings.IndeterminateStartingOffset = -dim;
SetCurrentValue(IndeterminateStartingOffsetProperty,-dim); TemplateSettings.IndeterminateEndingOffset = dim;
SetCurrentValue(IndeterminateEndingOffsetProperty,dim);
var padding = Padding;
var rectangle = new RectangleGeometry(
new Rect(
padding.Left,
padding.Top,
barSize.Width - (padding.Right + padding.Left),
barSize.Height - (padding.Bottom + padding.Top)
));
} }
else else
{ {
double percent = Maximum == Minimum ? 1.0 : (Value - Minimum) / (Maximum - Minimum); var percent = Math.Abs(Maximum - Minimum) < double.Epsilon ?
1.0 :
(Value - Minimum) / (Maximum - Minimum);
// When the Orientation changed, the indicator's Width or Height should set to double.NaN. // When the Orientation changed, the indicator's Width or Height should set to double.NaN.
// Indicator size calculation should consider the ProgressBar's Padding property setting // Indicator size calculation should consider the ProgressBar's Padding property setting
@ -332,7 +324,8 @@ namespace Avalonia.Controls
else else
{ {
_indicator.Width = double.NaN; _indicator.Width = double.NaN;
_indicator.Height = (barSize.Height - _indicator.Margin.Top - _indicator.Margin.Bottom) * percent; _indicator.Height = (barSize.Height - _indicator.Margin.Top - _indicator.Margin.Bottom) *
percent;
} }
@ -341,7 +334,7 @@ namespace Avalonia.Controls
} }
} }
private void UpdateIndicatorWhenPropChanged(AvaloniaPropertyChangedEventArgs e) private void UpdateIndicatorWhenPropChanged()
{ {
UpdateIndicator(); UpdateIndicator();
} }
@ -355,11 +348,9 @@ namespace Avalonia.Controls
PseudoClasses.Set(":indeterminate", isIndeterminate.Value); PseudoClasses.Set(":indeterminate", isIndeterminate.Value);
} }
if (o.HasValue) if (!o.HasValue) return;
{ PseudoClasses.Set(":vertical", o == Orientation.Vertical);
PseudoClasses.Set(":vertical", o == Orientation.Vertical); PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
PseudoClasses.Set(":horizontal", o == Orientation.Horizontal);
}
} }
} }
} }

8
src/Avalonia.Themes.Simple/Controls/ProgressBar.xaml
View File

@ -87,10 +87,10 @@
IterationCount="Infinite" IterationCount="Infinite"
Duration="0:0:3"> Duration="0:0:3">
<KeyFrame Cue="0%"> <KeyFrame Cue="0%">
<Setter Property="TranslateTransform.X" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" /> <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame> </KeyFrame>
<KeyFrame Cue="100%"> <KeyFrame Cue="100%">
<Setter Property="TranslateTransform.X" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" /> <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame> </KeyFrame>
</Animation> </Animation>
</Style.Animations> </Style.Animations>
@ -102,10 +102,10 @@
IterationCount="Infinite" IterationCount="Infinite"
Duration="0:0:3"> Duration="0:0:3">
<KeyFrame Cue="0%"> <KeyFrame Cue="0%">
<Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateStartingOffset, RelativeSource={RelativeSource TemplatedParent}}" /> <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame> </KeyFrame>
<KeyFrame Cue="100%"> <KeyFrame Cue="100%">
<Setter Property="TranslateTransform.Y" Value="{Binding IndeterminateEndingOffset, RelativeSource={RelativeSource TemplatedParent}}" /> <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame> </KeyFrame>
</Animation> </Animation>
</Style.Animations> </Style.Animations>

Write Preview
Loading…
Cancel
Save