From 4554a3d5d7335bcd85066ac87bb3692ab3a7eab7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 May 2020 16:09:40 -0300
Subject: [PATCH] fix progress bar.

---
 samples/ControlCatalog/App.xaml             |  7 +++---
 samples/ControlCatalog/MainView.xaml.cs     | 25 ---------------------
 samples/ControlCatalog/MainWindow.xaml      |  2 +-
 src/Avalonia.Themes.Fluent/ProgressBar.xaml |  7 +++---
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 20ca291910..d59c15bb6a 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -2,9 +2,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.App">
   <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>    
+    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default" />
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"/>
+    <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
+    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
     <Style Selector="TextBlock.h1">
       <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
       <Setter Property="FontWeight" Value="Medium"/>
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 2d01d37dbe..8738a54fa9 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -32,31 +32,6 @@ namespace ControlCatalog
 
             }
 
-            var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default")
-            };
-            var dark = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
-            {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default")
-            };
-
-
-            var themes = this.Find<ComboBox>("Themes");
-            themes.SelectionChanged += (sender, e) =>
-            {
-                switch (themes.SelectedIndex)
-                {
-                    case 0:
-                        Styles[0] = light;
-                        break;
-                    case 1:
-                        Styles[0] = dark;
-                        break;
-                }
-            };
-            Styles.Add(light);
-
             var decorations = this.Find<ComboBox>("Decorations");
             decorations.SelectionChanged += (sender, e) =>
             {
diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index a0bb956425..670e30725b 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
         xmlns:v="clr-namespace:ControlCatalog.Views"
-        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}" Background="Transparent">
+        x:Class="ControlCatalog.MainWindow" WindowState="{Binding WindowState, Mode=TwoWay}">
   <NativeMenu.Menu>
     <NativeMenu>
       <NativeMenuItem Header="File">
diff --git a/src/Avalonia.Themes.Fluent/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/ProgressBar.xaml
index 39a573303c..a77c28767e 100644
--- a/src/Avalonia.Themes.Fluent/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/ProgressBar.xaml
@@ -3,7 +3,7 @@
     <Border Padding="20">
       <StackPanel>
         <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" />
-        <ProgressBar VerticalAlignment="Center" IsIndeterminate="True" Orientation="Vertical" />
+        <ProgressBar HorizontalAlignment="Left" IsIndeterminate="True" Orientation="Vertical" />
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -83,8 +83,7 @@
             <Border
                 x:Name="PART_Indicator"
                 Margin="{TemplateBinding Padding}"
-                Background="{TemplateBinding Foreground}"
-                HorizontalAlignment="Left"
+                Background="{TemplateBinding Foreground}"                
                 CornerRadius="{DynamicResource ControlCornerRadius}" />
           </Border>
         </Grid>
@@ -132,7 +131,7 @@
   </Style>
   <Style Selector="ProgressBar:vertical:indeterminate /template/ Border#PART_Indicator">
     <Style.Animations>
-      <Animation Duration="0:0:3"
+      <Animation Duration="0:0:1"
                  IterationCount="Infinite"
                  Easing="LinearEasing">
         <KeyFrame Cue="0%">