From ea62b109b7212082dfca0fd37b29ce842b95a5f0 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 24 Jul 2015 21:13:52 +0200 Subject: [PATCH] Make ProgressBar compile. And add to test app. --- Perspex.Themes.Default/ProgressBarStyle.cs | 5 ++--- TestApplication/Program.cs | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Perspex.Themes.Default/ProgressBarStyle.cs b/Perspex.Themes.Default/ProgressBarStyle.cs index 26f8a3be5a..976beac27e 100644 --- a/Perspex.Themes.Default/ProgressBarStyle.cs +++ b/Perspex.Themes.Default/ProgressBarStyle.cs @@ -36,7 +36,7 @@ [~Border.BorderBrushProperty] = control[~ProgressBar.BorderBrushProperty], [~Border.BorderThicknessProperty] = control[~ProgressBar.BorderThicknessProperty], - Content = new Grid + Child = new Grid { MinHeight = 14, MinWidth = 200, @@ -56,8 +56,7 @@ BorderThickness = 1, HorizontalAlignment = HorizontalAlignment.Left, [~Border.BackgroundProperty] = control[~ProgressBar.ForegroundProperty], - - Content = new Grid + Child = new Grid { Name = "Animation", ClipToBounds = true, diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs index e9310eda59..d6f5152f88 100644 --- a/TestApplication/Program.cs +++ b/TestApplication/Program.cs @@ -448,6 +448,10 @@ namespace TestApplication [!Image.HeightProperty] = size[!ScrollBar.ValueProperty], }, }, + new ProgressBar + { + Value = 50 + } } }, };