Browse Source

fluent 2 - alias animation durations

pull/21771/head
Emmanuel Hansen 3 weeks ago
parent
commit
6a7ed6a8ea
  1. 5
      src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
  2. 4
      src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
  3. 2
      src/Avalonia.Themes.Fluent2/Controls/Button.xaml
  4. 2
      src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml
  5. 2
      src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml
  6. 2
      src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml
  7. 2
      src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml
  8. 2
      src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml
  9. 2
      src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
  10. 2
      src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml
  11. 2
      src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml
  12. 2
      src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml
  13. 2
      src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml
  14. 6
      src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
  15. 2
      src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml
  16. 2
      src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml
  17. 2
      src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml
  18. 2
      src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml
  19. 2
      src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml
  20. 2
      src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml
  21. 2
      src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml

5
src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml

@ -6,7 +6,10 @@
<FontFamily x:Key="ContentControlThemeFontFamily">fonts:Inter#Inter, $Default</FontFamily> <FontFamily x:Key="ContentControlThemeFontFamily">fonts:Inter#Inter, $Default</FontFamily>
<sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double> <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" /> <SplineEasing x:Key="ControlFastOutSlowInKeySpline" X1="0" Y1="0" X2="0" Y2="1" />
<SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" /> <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />

4
src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml

@ -300,8 +300,4 @@
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </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> </ResourceDictionary>

2
src/Avalonia.Themes.Fluent2/Controls/Button.xaml

@ -39,7 +39,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/CalendarButton.xaml

@ -53,7 +53,7 @@
ClipToBounds="True"> ClipToBounds="True">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>

2
src/Avalonia.Themes.Fluent2/Controls/CalendarDayButton.xaml

@ -53,7 +53,7 @@
ClipToBounds="True"> ClipToBounds="True">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>

2
src/Avalonia.Themes.Fluent2/Controls/CalendarItem.xaml

@ -46,7 +46,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/ComboBox.xaml

@ -111,7 +111,7 @@
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"> MinWidth="{DynamicResource ComboBoxThemeMinWidth}">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
</Border> </Border>

2
src/Avalonia.Themes.Fluent2/Controls/DatePicker.xaml

@ -62,7 +62,7 @@
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml

@ -93,7 +93,7 @@
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/DropDownButton.xaml

@ -45,7 +45,7 @@
Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
<Grid x:Name="InnerGrid"> <Grid x:Name="InnerGrid">

2
src/Avalonia.Themes.Fluent2/Controls/HyperlinkButton.xaml

@ -44,7 +44,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/NotificationCard.xaml

@ -56,7 +56,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/RepeatButton.xaml

@ -40,7 +40,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

6
src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml

@ -94,7 +94,7 @@
</Setter> </Setter>
<Setter Property="Transitions"> <Setter Property="Transitions">
<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> </Transitions>
</Setter> </Setter>
@ -151,7 +151,7 @@
Grid.RowSpan="3"> Grid.RowSpan="3">
<Rectangle.Transitions> <Rectangle.Transitions>
<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> </Transitions>
</Rectangle.Transitions> </Rectangle.Transitions>
</Rectangle> </Rectangle>
@ -239,7 +239,7 @@
Grid.ColumnSpan="3"> Grid.ColumnSpan="3">
<Rectangle.Transitions> <Rectangle.Transitions>
<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> </Transitions>
</Rectangle.Transitions> </Rectangle.Transitions>
</Rectangle> </Rectangle>

2
src/Avalonia.Themes.Fluent2/Controls/ScrollViewer.xaml

@ -59,7 +59,7 @@
Opacity="0"> Opacity="0">
<Panel.Transitions> <Panel.Transitions>
<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> </Transitions>
</Panel.Transitions> </Panel.Transitions>
</Panel> </Panel>

2
src/Avalonia.Themes.Fluent2/Controls/SplitButton.xaml

@ -63,7 +63,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/TabItem.xaml

@ -44,7 +44,7 @@
Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
<Panel> <Panel>

2
src/Avalonia.Themes.Fluent2/Controls/TabStripItem.xaml

@ -42,7 +42,7 @@
Padding="{TemplateBinding Padding}"> Padding="{TemplateBinding Padding}">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
<Panel> <Panel>

2
src/Avalonia.Themes.Fluent2/Controls/TimePicker.xaml

@ -61,7 +61,7 @@
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/ToggleButton.xaml

@ -43,7 +43,7 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
<ContentPresenter.Transitions> <ContentPresenter.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</ContentPresenter.Transitions> </ContentPresenter.Transitions>
</ContentPresenter> </ContentPresenter>

2
src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml

@ -84,7 +84,7 @@
TemplatedControl.IsTemplateFocusTarget="True"> TemplatedControl.IsTemplateFocusTarget="True">
<Border.Transitions> <Border.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Background" Duration="0:0:0.083" /> <BrushTransition Property="Background" Duration="{DynamicResource ControlFasterAnimationDuration}" />
</Transitions> </Transitions>
</Border.Transitions> </Border.Transitions>
<Panel> <Panel>

Loading…
Cancel
Save