Browse Source

retry

pull/4069/head
JamRemco 6 years ago
parent
commit
9ae64c236b
  1. 10
      src/Avalonia.Themes.Default/ToggleSwitch.xaml
  2. 1
      src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml
  3. 4
      src/Avalonia.Themes.Fluent/ToggleSwitch.xaml

10
src/Avalonia.Themes.Default/ToggleSwitch.xaml

@ -126,7 +126,7 @@
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
<Setter Property="BorderBrush" Value="royalblue"/>
</Style>
<Style Selector="ToggleSwitch:checked /template/ Border#PART_BorderBackground">
@ -140,12 +140,12 @@
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
<Setter Property="BorderBrush" Value="Royalblue"/>
</Style>
<Style Selector="ToggleSwitch:pressed /template/ Border#PART_BorderBackground">
<!--<Style Selector="ToggleSwitch:pressed /template/ Border#PART_BorderBackground">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
</Style>
</Style>-->
<Style Selector="ToggleSwitch:checked /template/ ContentControl#PART_TextBooleanValue">
<Setter Property="Content" Value="On"/>
@ -164,7 +164,7 @@
</Style>
<Style Selector="ToggleSwitch:focus:checked /template/ Border#PART_BorderBackground">
<Setter Property="Background" Value="{DynamicResource ToggleSwitchFillOn}"/>
<Setter Property="Background" Value="Royalblue"/>
</Style>
<Style Selector="ToggleSwitch:focus /template/ Border#PART_BorderBackground:pointerover">

1
src/Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml

@ -404,5 +404,6 @@
<SolidColorBrush x:Key="ToggleSwitchTrackPointerOverBackgroundThemeBrush" Color="#4A000000" />
<SolidColorBrush x:Key="ToggleSwitchTrackPressedBackgroundThemeBrush" Color="#42000000" />
</Style.Resources>
</Style>

4
src/Avalonia.Themes.Fluent/ToggleSwitch.xaml

@ -143,9 +143,9 @@
<Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOn}"/>
</Style>
<Style Selector="ToggleSwitch:pressed /template/ Border#PART_BorderBackground">
<!--<Style Selector="ToggleSwitch:pressed /template/ Border#PART_BorderBackground">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeControlHighBrush}"/>
</Style>
</Style>-->
<Style Selector="ToggleSwitch:checked /template/ ContentControl#PART_TextBooleanValue">
<Setter Property="Content" Value="On"/>

Loading…
Cancel
Save