Merge pull request #405 from irihitech/adorner

Update AdornerLayer

src/Semi.Avalonia/Controls/AdornerLayer.axaml

@@ -5,11 +5,8 @@
     <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
         <Setter Property="DefaultFocusAdorner">
             <FocusAdornerTemplate>
-                <Rectangle
+                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
-                    Margin="{DynamicResource AdornerLayerMargin}"
+                        BorderBrush="{DynamicResource AdornerLayerStroke}" />
-                    Stroke="{DynamicResource AdornerLayerBackground}"
-                    StrokeDashArray="1,2"
-                    StrokeThickness="{DynamicResource AdornerLayerThickness}" />
             </FocusAdornerTemplate>
         </Setter>
     </ControlTheme>

src/Semi.Avalonia/Controls/CheckBox.axaml

@@ -26,6 +26,7 @@
                     <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
                         <Grid
                             Grid.Column="0"
+                            TemplatedControl.IsTemplateFocusTarget="True"
                             Margin="0,0,0,0"
                             VerticalAlignment="Center">
                             <Border

src/Semi.Avalonia/Controls/RadioButton.axaml

@@ -39,7 +39,11 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <Grid ColumnDefinitions="Auto,*">
-                        <Grid Margin="{DynamicResource RadioButtonIconMargin}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <Grid
+                            Grid.Column="0"
+                            TemplatedControl.IsTemplateFocusTarget="True"
+                            Margin="{DynamicResource RadioButtonIconMargin}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Ellipse
                                 Name="OuterEllipse"
                                 Width="{DynamicResource RadioButtonIconRadius}"

src/Semi.Avalonia/Controls/ToggleSwitch.axaml

@@ -15,6 +15,13 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
+                        BorderBrush="{DynamicResource AdornerLayerStroke}" 
+                        CornerRadius="100"/>
+            </FocusAdornerTemplate>
+        </Setter>
         <Setter Property="KnobTransitions">
             <Transitions>
                 <DoubleTransition
@@ -28,27 +35,23 @@
                 <Grid
                     Background="{TemplateBinding Background}"
                     Cursor="Hand"
-                    RowDefinitions="Auto,*">
+                    RowDefinitions="Auto,*"
+                    ColumnDefinitions="Auto, *">
                     <ContentPresenter
                         x:Name="PART_ContentPresenter"
-                        Grid.Row="0"
+                        Grid.Row="0" Grid.Column="0"
+                        Grid.ColumnSpan="2"
                         Margin="{DynamicResource ToggleSwitchHeaderMargin}"
                         VerticalAlignment="Top"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
                         RecognizesAccessKey="True" />
-                    <Grid
+
-                        Grid.Row="1"
-                        Background="Transparent"
-                        ColumnDefinitions="Auto, *">
-                        <Grid
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            TemplatedControl.IsTemplateFocusTarget="True" />
                     <Border
                         x:Name="SwitchBackgroundBorder"
-                            Grid.Column="0"
+                        Grid.Row="1" Grid.Column="0"
+                        TemplatedControl.IsTemplateFocusTarget="True"
                         Width="{DynamicResource ToggleSwitchDefaultWidth}"
                         Height="{DynamicResource ToggleSwitchDefaultHeight}"
                         CornerRadius="100">
@@ -83,8 +86,8 @@
                                     <Arc.Stroke>
                                         <ConicGradientBrush>
                                             <GradientStops>
-                                                    <GradientStop Offset="0.1" Color="Transparent"/>
+                                                <GradientStop Offset="0.1" Color="Transparent" />
-                                                    <GradientStop Offset="0.7" Color="White"/>
+                                                <GradientStop Offset="0.7" Color="White" />
                                             </GradientStops>
                                         </ConicGradientBrush>
                                     </Arc.Stroke>
@@ -109,26 +112,22 @@
 
                     <ContentPresenter
                         x:Name="PART_OnContentPresenter"
-                            Grid.Column="1"
+                        Grid.Row="1" Grid.Column="1"
                         Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         VerticalContentAlignment="Center"
                         Content="{TemplateBinding OnContent}"
-                            ContentTemplate="{TemplateBinding OnContentTemplate}"
+                        ContentTemplate="{TemplateBinding OnContentTemplate}" />
-                            IsVisible="True" />
                     <ContentPresenter
                         x:Name="PART_OffContentPresenter"
-                            Grid.Column="1"
+                        Grid.Row="1" Grid.Column="1"
                         Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         VerticalContentAlignment="Center"
                         Content="{TemplateBinding OffContent}"
-                            ContentTemplate="{TemplateBinding OffContentTemplate}"
+                        ContentTemplate="{TemplateBinding OffContentTemplate}" />
-                            IsVisible="False" />
-
-                    </Grid>
                 </Grid>
             </ControlTemplate>
         </Setter>
@@ -241,6 +240,12 @@
         <Setter Property="Padding" Value="8" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+                <Border BorderThickness="{DynamicResource AdornerLayerBorderThickness}"
+                        BorderBrush="{DynamicResource AdornerLayerStroke}" />
+            </FocusAdornerTemplate>
+        </Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="ToggleSwitch">
                 <Border
@@ -249,9 +254,9 @@
                     Background="{TemplateBinding Background}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Cursor="Hand">
-                    <Grid ColumnDefinitions="Auto">
+                    <Panel>
-                        <Grid x:Name="PART_SwitchKnob" />
+                        <Panel x:Name="PART_SwitchKnob" />
-                        <Grid x:Name="PART_MovingKnobs" />
+                        <Panel x:Name="PART_MovingKnobs" />
                         <ContentPresenter
                             x:Name="PART_OnContentPresenter"
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
@@ -262,7 +267,7 @@
                             Margin="{DynamicResource ToggleSwitchOnContentMargin}"
                             Content="{TemplateBinding OffContent}"
                             ContentTemplate="{TemplateBinding OffContentTemplate}" />
-                    </Grid>
+                    </Panel>
                 </Border>
             </ControlTemplate>
         </Setter>

src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="White" />
+    <SolidColorBrush x:Key="AdornerLayerStroke" Opacity="0.4" Color="#54A9FF" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="AdornerLayerStroke" Color="#98CDFD" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml

@@ -1,4 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="AdornerLayerMargin">1</Thickness>
+    <Thickness x:Key="AdornerLayerBorderThickness">2</Thickness>
-    <x:Double x:Key="AdornerLayerThickness">1</x:Double>
 </ResourceDictionary>