Browse Source

fluent2 - replace hardcoded easing with theme resource

pull/21771/head
Emmanuel Hansen 3 weeks ago
parent
commit
a4e533d1b2
  1. 5
      src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
  2. 2
      src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
  3. 4
      src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
  4. 4
      src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
  5. 2
      src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
  6. 10
      src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml
  7. 7
      src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml
  8. 2
      src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
  9. 10
      src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml
  10. 2
      src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml

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

@ -6,6 +6,9 @@
<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>
<SplineEasing x:Key="ControlFastOutSlowInKeySpline" X1="0" Y1="0" X2="0" Y2="1" />
<SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" /> <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
<x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean> <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
<Thickness x:Key="TextControlBorderThemeThickness">1</Thickness> <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
@ -53,7 +56,7 @@
<!-- Moved from Menu.xaml --> <!-- Moved from Menu.xaml -->
<Thickness x:Key="MenuBarItemPadding">10,4,10,4</Thickness> <Thickness x:Key="MenuBarItemPadding">10,4,10,4</Thickness>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default"> <ResourceDictionary x:Key="Default">
<SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" /> <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />

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

@ -301,9 +301,7 @@
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<!-- Canonical WinUI animation constants (variant independent). --> <!-- Canonical WinUI animation constants (variant independent). -->
<x:String x:Key="ControlFastOutSlowInKeySpline">0,0,0,1</x:String>
<x:String x:Key="ControlNormalAnimationDuration">00:00:00.250</x:String> <x:String x:Key="ControlNormalAnimationDuration">00:00:00.250</x:String>
<x:String x:Key="ControlFastAnimationDuration">00:00:00.167</x:String>
<x:String x:Key="ControlFastAnimationAfterDuration">00:00:00.168</x:String> <x:String x:Key="ControlFastAnimationAfterDuration">00:00:00.168</x:String>
<x:String x:Key="ControlFasterAnimationDuration">00:00:00.083</x:String> <x:String x:Key="ControlFasterAnimationDuration">00:00:00.083</x:String>
</ResourceDictionary> </ResourceDictionary>

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

@ -459,6 +459,8 @@
<StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" /> <StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" />
<StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" /> <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" />
<StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" /> <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" />
<StaticResource x:Key="SliderOuterThumbBackground" ResourceKey="ControlSolidFillColorDefaultBrush" />
<StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="ControlElevationBorderBrush" />
<!--Recources ToggleSwitch--> <!--Recources ToggleSwitch-->
<Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness> <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
@ -1157,6 +1159,8 @@
<StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" /> <StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" />
<StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" /> <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" />
<StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" /> <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" />
<StaticResource x:Key="SliderOuterThumbBackground" ResourceKey="ControlSolidFillColorDefaultBrush" />
<StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="ControlElevationBorderBrush" />
<!--ToggleSwitch--> <!--ToggleSwitch-->
<Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness> <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>

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

@ -140,7 +140,7 @@
<Setter Property="Opacity" Value="0"/> <Setter Property="Opacity" Value="0"/>
<Setter Property="Transitions"> <Setter Property="Transitions">
<Transitions> <Transitions>
<DoubleTransition Property="Opacity" Duration="0:0:0.167" /> <DoubleTransition Property="Opacity" Duration="{StaticResource ControlFastAnimationDuration}" />
</Transitions> </Transitions>
</Setter> </Setter>
<Setter Property="Content"> <Setter Property="Content">
@ -174,7 +174,7 @@
<Setter Property="Opacity" Value="0"/> <Setter Property="Opacity" Value="0"/>
<Setter Property="Transitions"> <Setter Property="Transitions">
<Transitions> <Transitions>
<DoubleTransition Property="Opacity" Duration="0:0:0.167" /> <DoubleTransition Property="Opacity" Duration="{StaticResource ControlFastAnimationDuration}" />
</Transitions> </Transitions>
</Setter> </Setter>
<Setter Property="Content"> <Setter Property="Content">

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

@ -63,7 +63,7 @@
Fill="{DynamicResource AccentFillColorDefaultBrush}"> Fill="{DynamicResource AccentFillColorDefaultBrush}">
<Rectangle.Transitions> <Rectangle.Transitions>
<Transitions> <Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Easing="0,0 0,1" /> <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Easing="0,0 0,1" />
</Transitions> </Transitions>
</Rectangle.Transitions> </Rectangle.Transitions>
</Rectangle> </Rectangle>

10
src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml

@ -97,8 +97,8 @@
StrokeThickness="1"> StrokeThickness="1">
<Ellipse.Transitions> <Ellipse.Transitions>
<Transitions> <Transitions>
<BrushTransition Property="Fill" Duration="0:0:0.167" /> <BrushTransition Property="Fill" Duration="{StaticResource ControlFastAnimationDuration}" />
<BrushTransition Property="Stroke" Duration="0:0:0.167" /> <BrushTransition Property="Stroke" Duration="{StaticResource ControlFastAnimationDuration}" />
</Transitions> </Transitions>
</Ellipse.Transitions> </Ellipse.Transitions>
</Ellipse> </Ellipse>
@ -110,9 +110,9 @@
Fill="{DynamicResource PipsPagerSelectionIndicatorForeground}"> Fill="{DynamicResource PipsPagerSelectionIndicatorForeground}">
<Ellipse.Transitions> <Ellipse.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Width" Duration="0:0:0.167" /> <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" />
<DoubleTransition Property="Height" Duration="0:0:0.167" /> <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" />
<BrushTransition Property="Fill" Duration="0:0:0.167" /> <BrushTransition Property="Fill" Duration="{StaticResource ControlFastAnimationDuration}" />
</Transitions> </Transitions>
</Ellipse.Transitions> </Ellipse.Transitions>
</Ellipse> </Ellipse>

7
src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml

@ -18,8 +18,7 @@
<x:Double x:Key="RadioButtonCheckGlyphSize">12</x:Double> <x:Double x:Key="RadioButtonCheckGlyphSize">12</x:Double>
<x:Double x:Key="RadioButtonCheckGlyphPointerOverSize">14</x:Double> <x:Double x:Key="RadioButtonCheckGlyphPointerOverSize">14</x:Double>
<x:Double x:Key="RadioButtonCheckGlyphPressedOverSize">10</x:Double> <x:Double x:Key="RadioButtonCheckGlyphPressedOverSize">10</x:Double>
<!-- WinUI ControlFastOutSlowInKeySpline --> <StaticResource x:Key="RadioButtonCheckGlyphEasing" ResourceKey="ControlFastOutSlowInKeySpline"/>
<Easing x:Key="RadioButtonCheckGlyphEasing">0,0,0,1</Easing>
<!-- WinUI reference: RadioButton_themeresources.xaml (DefaultRadioButtonStyle), tag winui3/release/1.5.2. <!-- WinUI reference: RadioButton_themeresources.xaml (DefaultRadioButtonStyle), tag winui3/release/1.5.2.
The check glyph is a white dot on an accent-filled outer circle; it grows to 14px on hover and The check glyph is a white dot on an accent-filled outer circle; it grows to 14px on hover and
@ -79,8 +78,8 @@
UseLayoutRounding="False"> UseLayoutRounding="False">
<Ellipse.Transitions> <Ellipse.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource RadioButtonCheckGlyphEasing}" /> <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
<DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource RadioButtonCheckGlyphEasing}" /> <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
</Transitions> </Transitions>
</Ellipse.Transitions> </Ellipse.Transitions>
</Ellipse> </Ellipse>

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

@ -50,7 +50,7 @@
<Setter Property="Transitions"> <Setter Property="Transitions">
<Transitions> <Transitions>
<CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" /> <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Delay="0:0:0.1"> <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Delay="0:0:0.1">
<TransformOperationsTransition.Easing> <TransformOperationsTransition.Easing>
<SplineEasing X1="0" Y1="0" X2="0" Y2="1" /> <SplineEasing X1="0" Y1="0" X2="0" Y2="1" />
</TransformOperationsTransition.Easing> </TransformOperationsTransition.Easing>

10
src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml

@ -43,7 +43,7 @@
<DoubleTransition <DoubleTransition
Easing="{StaticResource ToggleSwitchKnobEasing}" Easing="{StaticResource ToggleSwitchKnobEasing}"
Property="Canvas.Left" Property="Canvas.Left"
Duration="0:0:0.167" /> Duration="{StaticResource ControlFastAnimationDuration}" />
</Transitions> </Transitions>
</Setter> </Setter>
<Setter Property="Template"> <Setter Property="Template">
@ -137,8 +137,8 @@
Height="{DynamicResource ToggleSwitchKnobSize}"> Height="{DynamicResource ToggleSwitchKnobSize}">
<Ellipse.Transitions> <Ellipse.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" /> <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
<DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" /> <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
</Transitions> </Transitions>
</Ellipse.Transitions> </Ellipse.Transitions>
</Ellipse> </Ellipse>
@ -149,8 +149,8 @@
Height="{DynamicResource ToggleSwitchKnobSize}"> Height="{DynamicResource ToggleSwitchKnobSize}">
<Ellipse.Transitions> <Ellipse.Transitions>
<Transitions> <Transitions>
<DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" /> <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
<DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" /> <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
</Transitions> </Transitions>
</Ellipse.Transitions> </Ellipse.Transitions>
</Ellipse> </Ellipse>

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

@ -129,7 +129,7 @@
IsVisible="False"> IsVisible="False">
<Rectangle.Transitions> <Rectangle.Transitions>
<Transitions> <Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Easing="0,0 0,1" /> <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Easing="0,0 0,1" />
</Transitions> </Transitions>
</Rectangle.Transitions> </Rectangle.Transitions>
</Rectangle> </Rectangle>

Loading…
Cancel
Save