fluent 2 - alias animation durations

3 weeks ago · 6a7ed6a8ea
21 changed files with 25 additions and 26 deletions
--- a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
@ -6,7 +6,10 @@
  <FontFamily x:Key="ContentControlThemeFontFamily">fonts:Inter#Inter, $Default</FontFamily>
  <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
-  <sys:TimeSpan x:Key="ControlFastAnimationDuration">00:00:00.167</sys:TimeSpan>
+  <sys:TimeSpan x:Key="ControlFastAnimationDuration">00:00:00.167</sys:TimeSpan>  
  <sys:TimeSpan x:Key="ControlNormalAnimationDuration">00:00:00.250</sys:TimeSpan>
  <sys:TimeSpan x:Key="ControlFastAnimationAfterDuration">00:00:00.168</sys:TimeSpan>
  <sys:TimeSpan x:Key="ControlFasterAnimationDuration">00:00:00.083</sys:TimeSpan>
  <SplineEasing x:Key="ControlFastOutSlowInKeySpline" X1="0" Y1="0" X2="0" Y2="1" />
  <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
--- a/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
@ -300,8 +300,4 @@
    </ResourceDictionary>
  </ResourceDictionary.ThemeDictionaries>
  <!-- Canonical WinUI animation constants (variant independent). -->
  <x:String x:Key="ControlNormalAnimationDuration">00:00:00.250</x:String>
  <x:String x:Key="ControlFastAnimationAfterDuration">00:00:00.168</x:String>
  <x:String x:Key="ControlFasterAnimationDuration">00:00:00.083</x:String>
 </ResourceDictionary>
--- a/src/Avalonia.Themes.Fluent2/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/Button.xaml
@ -39,7 +39,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
@ -53,7 +53,7 @@
                  ClipToBounds="True">
            <Border.Transitions>
              <Transitions>
-                <BrushTransition Property="Background" Duration="0:0:0.083" />
+                <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
              </Transitions>
            </Border.Transitions>
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
@ -53,7 +53,7 @@
                  ClipToBounds="True">
            <Border.Transitions>
              <Transitions>
-                <BrushTransition Property="Background" Duration="0:0:0.083" />
+                <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
              </Transitions>
            </Border.Transitions>
--- a/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
@ -46,7 +46,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
@ -111,7 +111,7 @@
                    MinWidth="{DynamicResource ComboBoxThemeMinWidth}">
              <Border.Transitions>
                <Transitions>
-                  <BrushTransition Property="Background" Duration="0:0:0.083" />
+                  <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
                </Transitions>
              </Border.Transitions>
            </Border>
--- a/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
@ -62,7 +62,7 @@
                          CornerRadius="{TemplateBinding CornerRadius}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
@ -93,7 +93,7 @@
                  CornerRadius="{TemplateBinding CornerRadius}">
            <ContentPresenter.Transitions>
              <Transitions>
-                <BrushTransition Property="Background" Duration="0:0:0.083" />
+                <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
              </Transitions>
            </ContentPresenter.Transitions>
          </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
@ -45,7 +45,7 @@
                  Padding="{TemplateBinding Padding}">
            <Border.Transitions>
              <Transitions>
-                <BrushTransition Property="Background" Duration="0:0:0.083" />
+                <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
              </Transitions>
            </Border.Transitions>
            <Grid x:Name="InnerGrid">
--- a/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
@ -44,7 +44,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
@ -56,7 +56,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
@ -40,7 +40,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
@ -94,7 +94,7 @@
    </Setter>
    <Setter Property="Transitions">
      <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.083" Delay="0:0:0.1" />
+        <DoubleTransition Property="Opacity" Duration="{DynamicResource ControlFasterAnimationDuration}" Delay="0:0:0.1" />
      </Transitions>
    </Setter>
@ -151,7 +151,7 @@
                           Grid.RowSpan="3">
                  <Rectangle.Transitions>
                    <Transitions>
-                      <DoubleTransition Property="Opacity" Duration="0:0:0.083" Delay="0:0:0.1" />
+                      <DoubleTransition Property="Opacity" Duration="{DynamicResource ControlFasterAnimationDuration}" Delay="0:0:0.1" />
                    </Transitions>
                  </Rectangle.Transitions>
                </Rectangle>
@ -239,7 +239,7 @@
                           Grid.ColumnSpan="3">
                  <Rectangle.Transitions>
                    <Transitions>
-                      <DoubleTransition Property="Opacity" Duration="0:0:0.083" Delay="0:0:0.1" />
+                      <DoubleTransition Property="Opacity" Duration="{DynamicResource ControlFasterAnimationDuration}" Delay="0:0:0.1" />
                    </Transitions>
                  </Rectangle.Transitions>
                </Rectangle>
--- a/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
@ -59,7 +59,7 @@
                 Opacity="0">
            <Panel.Transitions>
              <Transitions>
-                <DoubleTransition Property="Opacity" Duration="0:0:0.083" Delay="0:0:0.1" />
+                <DoubleTransition Property="Opacity" Duration="{DynamicResource ControlFasterAnimationDuration}" Delay="0:0:0.1" />
              </Transitions>
            </Panel.Transitions>
          </Panel>
--- a/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
@ -63,7 +63,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
@ -44,7 +44,7 @@
            Padding="{TemplateBinding Padding}">
          <Border.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </Border.Transitions>
          <Panel>
--- a/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
@ -42,7 +42,7 @@
            Padding="{TemplateBinding Padding}">
          <Border.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </Border.Transitions>
          <Panel>
--- a/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
@ -61,7 +61,7 @@
                          CornerRadius="{TemplateBinding CornerRadius}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
@ -43,7 +43,7 @@
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
          <ContentPresenter.Transitions>
            <Transitions>
-              <BrushTransition Property="Background" Duration="0:0:0.083" />
+              <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
            </Transitions>
          </ContentPresenter.Transitions>
        </ContentPresenter>
--- a/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
@ -84,7 +84,7 @@
                  TemplatedControl.IsTemplateFocusTarget="True">
            <Border.Transitions>
              <Transitions>
-                <BrushTransition Property="Background" Duration="0:0:0.083" />
+                <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
              </Transitions>
            </Border.Transitions>
            <Panel>