Skip to content

Commit

Permalink
Merge branch 'amwx:master' into master
Browse files Browse the repository at this point in the history
NotroDev authored Dec 28, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 8e18426 + 3ef356a commit 3d8c2fc
Showing 2 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:CompileBindings="True">
<Styles.Resources>
<Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
<Thickness x:Key="SystemControlFocusVisualPrimaryThickness">2</Thickness>
<Thickness x:Key="SystemControlFocusVisualSecondaryThickness">1</Thickness>
</Styles.Resources>
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
<Thickness x:Key="SystemControlFocusVisualMargin">0</Thickness>
<Thickness x:Key="SystemControlFocusVisualPrimaryThickness">2</Thickness>
<Thickness x:Key="SystemControlFocusVisualSecondaryThickness">1</Thickness>

<Style Selector=":is(Control)">
<Setter Property="FocusAdorner">
<ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
<Setter Property="DefaultFocusAdorner">
<FocusAdornerTemplate>
<Border BorderThickness="{DynamicResource SystemControlFocusVisualPrimaryThickness}"
BorderBrush="{DynamicResource FocusStrokeColorOuterBrush}"
@@ -22,5 +18,5 @@
</Border>
</FocusAdornerTemplate>
</Setter>
</Style>
</Styles>
</ControlTheme>
</ResourceDictionary>
4 changes: 2 additions & 2 deletions src/FluentAvalonia/Styling/ControlThemes/Controls.axaml
Original file line number Diff line number Diff line change
@@ -57,7 +57,8 @@
<MergeResourceInclude Source="/Styling/ControlThemes/BasicControls/RefreshControlStyles.axaml" />
<MergeResourceInclude Source="/Styling/ControlThemes/BasicControls/PathIcon.axaml" />
<MergeResourceInclude Source="/Styling/ControlThemes/BasicControls/HyperlinkButtonStyles.axaml" />

<MergeResourceInclude Source="/Styling/ControlThemes/BasicControls/FocusAdornerStyles.axaml" />


<!-- FluentAvalonia Controls -->
<MergeResourceInclude Source="/Styling/ControlThemes/FAControls/FrameStyles.axaml" />
@@ -119,7 +120,6 @@
</ResourceDictionary>
</Styles.Resources>

<StyleInclude Source="/Styling/ControlThemes/BasicControls/FocusAdornerStyles.axaml" />
<StyleInclude Source="/Styling/ControlThemes/BasicControls/UserControlStyles.axaml" />


0 comments on commit 3d8c2fc

Please sign in to comment.