-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
More bugfixes/compose view improvements
- Loading branch information
Showing
11 changed files
with
363 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using Windows.Foundation; | ||
| using Windows.UI.Xaml; | ||
| using Windows.UI.Xaml.Controls; | ||
| using Windows.UI.Xaml.Media; | ||
|
|
||
| namespace Microsoft.Toolkit.Uwp.UI.Controls | ||
| { | ||
| /// <summary> | ||
| /// An alternative implementation of a progress bar. | ||
| /// Progression is represented by a loop filling up in a clockwise fashion. | ||
| /// Like the traditional progress bar, it inherits from RangeBase, so Minimum, Maximum and Value properties work the same way. | ||
| /// </summary> | ||
| [TemplatePart(Name = OutlineFigurePartName, Type = typeof(PathFigure))] | ||
| [TemplatePart(Name = OutlineArcPartName, Type = typeof(ArcSegment))] | ||
| [TemplatePart(Name = BarFigurePartName, Type = typeof(PathFigure))] | ||
| [TemplatePart(Name = BarArcPartName, Type = typeof(ArcSegment))] | ||
| [TemplatePart(Name = TextPartName, Type = typeof(TextBlock))] | ||
| public partial class RadialProgressBar : ProgressBar | ||
| { | ||
| private const string OutlineFigurePartName = "OutlineFigurePart"; | ||
| private const string OutlineArcPartName = "OutlineArcPart"; | ||
| private const string BarFigurePartName = "BarFigurePart"; | ||
| private const string BarArcPartName = "BarArcPart"; | ||
| private const string TextPartName = "ProgressTextPart"; | ||
|
|
||
| private PathFigure outlineFigure; | ||
| private PathFigure barFigure; | ||
| private ArcSegment outlineArc; | ||
| private ArcSegment barArc; | ||
| private TextBlock textBlock; | ||
|
|
||
| private bool allTemplatePartsDefined = false; | ||
|
|
||
| /// <summary> | ||
| /// Called when the Minimum property changes. | ||
| /// </summary> | ||
| /// <param name="oldMinimum">Old value of the Minimum property.</param> | ||
| /// <param name="newMinimum">New value of the Minimum property.</param> | ||
| protected override void OnMinimumChanged(double oldMinimum, double newMinimum) | ||
| { | ||
| base.OnMinimumChanged(oldMinimum, newMinimum); | ||
| RenderSegment(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Called when the Maximum property changes. | ||
| /// </summary> | ||
| /// <param name="oldMaximum">Old value of the Maximum property.</param> | ||
| /// <param name="newMaximum">New value of the Maximum property.</param> | ||
| protected override void OnMaximumChanged(double oldMaximum, double newMaximum) | ||
| { | ||
| base.OnMaximumChanged(oldMaximum, newMaximum); | ||
| RenderSegment(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Called when the Value property changes. | ||
| /// </summary> | ||
| /// <param name="oldValue">Old value of the Value property.</param> | ||
| /// <param name="newValue">New value of the Value property.</param> | ||
| protected override void OnValueChanged(double oldValue, double newValue) | ||
| { | ||
| base.OnValueChanged(oldValue, newValue); | ||
| RenderSegment(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Update the visual state of the control when its template is changed. | ||
| /// </summary> | ||
| protected override void OnApplyTemplate() | ||
| { | ||
| base.OnApplyTemplate(); | ||
|
|
||
| outlineFigure = GetTemplateChild(OutlineFigurePartName) as PathFigure; | ||
| outlineArc = GetTemplateChild(OutlineArcPartName) as ArcSegment; | ||
| barFigure = GetTemplateChild(BarFigurePartName) as PathFigure; | ||
| barArc = GetTemplateChild(BarArcPartName) as ArcSegment; | ||
| textBlock = GetTemplateChild(TextPartName) as TextBlock; | ||
|
|
||
| allTemplatePartsDefined = outlineFigure != null && outlineArc != null && barFigure != null && barArc != null && textBlock != null; | ||
|
|
||
| RenderAll(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets the thickness of the circular outline and segment | ||
| /// </summary> | ||
| public double Thickness | ||
| { | ||
| get { return (double)GetValue(ThicknessProperty); } | ||
| set { SetValue(ThicknessProperty, value); } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Identifies the Thickness dependency property | ||
| /// </summary> | ||
| public static readonly DependencyProperty ThicknessProperty = DependencyProperty.Register(nameof(Thickness), typeof(double), typeof(RadialProgressBar), new PropertyMetadata(0.0, ThicknessChangedHandler)); | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets the color of the circular outline on which the segment is drawn | ||
| /// </summary> | ||
| public Brush Outline | ||
| { | ||
| get { return (Brush)GetValue(OutlineProperty); } | ||
| set { SetValue(OutlineProperty, value); } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Identifies the Outline dependency property | ||
| /// </summary> | ||
| public static readonly DependencyProperty OutlineProperty = DependencyProperty.Register(nameof(Outline), typeof(Brush), typeof(RadialProgressBar), new PropertyMetadata(new SolidColorBrush(Windows.UI.Colors.Transparent))); | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="RadialProgressBar"/> class. | ||
| /// Create a default circular progress bar | ||
| /// </summary> | ||
| public RadialProgressBar() | ||
| { | ||
| DefaultStyleKey = typeof(RadialProgressBar); | ||
| SizeChanged += SizeChangedHandler; | ||
| } | ||
|
|
||
| // Render outline and progress segment when thickness is changed | ||
| private static void ThicknessChangedHandler(DependencyObject d, DependencyPropertyChangedEventArgs e) | ||
| { | ||
| var sender = d as RadialProgressBar; | ||
| sender.RenderAll(); | ||
| } | ||
|
|
||
| // Render outline and progress segment when control is resized. | ||
| private void SizeChangedHandler(object sender, SizeChangedEventArgs e) | ||
| { | ||
| var self = sender as RadialProgressBar; | ||
| self.RenderAll(); | ||
| } | ||
|
|
||
| private double ComputeNormalizedRange() | ||
| { | ||
| var range = Maximum - Minimum; | ||
| var delta = Value - Minimum; | ||
| var output = range == 0.0 ? 0.0 : delta / range; | ||
| output = Math.Min(Math.Max(0.0, output), 0.9999); | ||
| return output; | ||
| } | ||
|
|
||
| // Compute size of ellipse so that the outer edge touches the bounding rectangle | ||
| private Size ComputeEllipseSize() | ||
| { | ||
| var safeThickness = Math.Max(Thickness, 0.0); | ||
| var width = Math.Max((ActualWidth - safeThickness) / 2.0, 0.0); | ||
| var height = Math.Max((ActualHeight - safeThickness) / 2.0, 0.0); | ||
| return new Size(width, height); | ||
| } | ||
|
|
||
| // Render the segment representing progress ratio. | ||
| private void RenderSegment() | ||
| { | ||
| if (!allTemplatePartsDefined) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| textBlock.Text = ((int)(Maximum - Value)).ToString(); | ||
|
|
||
| var normalizedRange = ComputeNormalizedRange(); | ||
|
|
||
| var angle = 2 * Math.PI * normalizedRange; | ||
| var size = ComputeEllipseSize(); | ||
| var translationFactor = Math.Max(Thickness / 2.0, 0.0); | ||
|
|
||
| double x = (Math.Sin(angle) * size.Width) + size.Width + translationFactor; | ||
| double y = (((Math.Cos(angle) * size.Height) - size.Height) * -1) + translationFactor; | ||
|
|
||
| barArc.IsLargeArc = angle >= Math.PI; | ||
| barArc.Point = new Point(x, y); | ||
| } | ||
|
|
||
| // Render the progress segment and the loop outline. Needs to run when control is resized or retemplated | ||
| private void RenderAll() | ||
| { | ||
| if (!allTemplatePartsDefined) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var size = ComputeEllipseSize(); | ||
| var segmentWidth = size.Width; | ||
| var translationFactor = Math.Max(Thickness / 2.0, 0.0); | ||
|
|
||
| outlineFigure.StartPoint = barFigure.StartPoint = new Point(segmentWidth + translationFactor, translationFactor); | ||
| outlineArc.Size = barArc.Size = new Size(segmentWidth, size.Height); | ||
| outlineArc.Point = new Point(segmentWidth + translationFactor - 0.05, translationFactor); | ||
|
|
||
| RenderSegment(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <ResourceDictionary | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"> | ||
|
|
||
| <Style TargetType="local:RadialProgressBar" > | ||
| <Setter Property="Foreground" Value="{ThemeResource SystemControlHighlightAccentBrush}" /> | ||
| <Setter Property="Outline" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" /> | ||
| <Setter Property="Background" Value="Transparent" /> | ||
| <Setter Property="Thickness" Value="4"/> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="local:RadialProgressBar"> | ||
| <Grid Background="{TemplateBinding Background}"> | ||
| <!-- Gray outline of progress bar --> | ||
| <Path Fill="Transparent" Stroke="{TemplateBinding Outline}" StrokeThickness="{TemplateBinding Thickness}" StrokeDashCap="Flat"> | ||
| <Path.Data> | ||
| <PathGeometry> | ||
| <PathGeometry.Figures> | ||
| <PathFigureCollection> | ||
| <PathFigure x:Name="OutlineFigurePart"> | ||
| <PathFigure.Segments> | ||
| <PathSegmentCollection> | ||
| <ArcSegment x:Name="OutlineArcPart" IsLargeArc="True" SweepDirection="Clockwise"/> | ||
| </PathSegmentCollection> | ||
| </PathFigure.Segments> | ||
| </PathFigure> | ||
| </PathFigureCollection> | ||
| </PathGeometry.Figures> | ||
| </PathGeometry> | ||
| </Path.Data> | ||
| </Path> | ||
| <!-- Progress Bar --> | ||
| <Path Fill="Transparent" Stroke="{TemplateBinding Foreground}" StrokeThickness="{TemplateBinding Thickness}" StrokeDashCap="Flat"> | ||
| <Path.Data> | ||
| <PathGeometry> | ||
| <PathGeometry.Figures> | ||
| <PathFigureCollection> | ||
| <PathFigure x:Name="BarFigurePart"> | ||
| <PathFigure.Segments> | ||
| <PathSegmentCollection> | ||
| <ArcSegment x:Name="BarArcPart" IsLargeArc="False" SweepDirection="Clockwise" /> | ||
| </PathSegmentCollection> | ||
| </PathFigure.Segments> | ||
| </PathFigure> | ||
| </PathFigureCollection> | ||
| </PathGeometry.Figures> | ||
| </PathGeometry> | ||
| </Path.Data> | ||
| </Path> | ||
|
|
||
| <TextBlock x:Name="ProgressTextPart" | ||
| FontSize="12" | ||
| Foreground="{TemplateBinding Foreground}" | ||
| VerticalAlignment="Center" | ||
| HorizontalAlignment="Center" | ||
| Typography.NumeralAlignment="Tabular"/> | ||
| </Grid> | ||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| </Style> | ||
| </ResourceDictionary> |
File renamed without changes.
Oops, something went wrong.