Formatting XAML

fluentribbon · May 7, 2023 · 22ade03 · 22ade03
1 parent eaef784
commit 22ade03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Fluent.Ribbon/Themes/Controls/FocusStyles.xaml b/Fluent.Ribbon/Themes/Controls/FocusStyles.xaml
@@ -11,10 +11,10 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.FocusVisual.Rectangle"
            TargetType="{x:Type Rectangle}">
+        <Setter Property="Margin" Value="-1" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Stroke" Value="{DynamicResource Fluent.Ribbon.Brushes.Black}" />
         <Setter Property="StrokeThickness" Value="2" />
-        <Setter Property="Margin" Value="-1" />
     </Style>
 
     <ControlTemplate x:Key="Fluent.Ribbon.Templates.FocusVisual"

diff --git a/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml b/Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
@@ -89,13 +89,13 @@
 
     <Style x:Key="Fluent.Ribbon.Styles.RibbonTabControl.DisplayOptionsButton"
            TargetType="{x:Type Fluent:DropDownButton}">
+        <Setter Property="AutomationProperties.Name" Value="{Binding Uid, RelativeSource={RelativeSource Self}}" />
         <Setter Property="CanAddToQuickAccessToolBar" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource Fluent.Ribbon.Brushes.LabelText}" />
         <Setter Property="Height" Value="22" />
         <Setter Property="ResizeMode" Value="None" />
         <Setter Property="Template" Value="{DynamicResource Fluent.Ribbon.Templates.RibbonTabControl.DisplayOptionsButton}" />
         <Setter Property="Uid" Value="{Binding Source={x:Static Fluent:RibbonLocalization.Current}, Path=Localization.DisplayOptionsButtonScreenTipTitle, Mode=OneWay}" />
-        <Setter Property="AutomationProperties.Name" Value="{Binding Uid, RelativeSource={RelativeSource Self}}" />
         <Setter Property="Width" Value="22" />
     </Style>
 

diff --git a/Fluent.Ribbon/Themes/Controls/WindowCommands.xaml b/Fluent.Ribbon/Themes/Controls/WindowCommands.xaml
@@ -25,11 +25,11 @@
 
             <Button x:Name="PART_Min"
                     Uid="{Binding Minimize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
-                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Style="{DynamicResource Fluent.Ribbon.Styles.WindowCommands.CaptionButton}"
                     Padding="0"
                     controlzex:NonClientControlProperties.ClickStrategy="MouseEvent"
                     controlzex:NonClientControlProperties.HitTestResult="MINBUTTON"
+                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Focusable="False"
                     SnapsToDevicePixels="True"
                     ToolTip="{Binding Minimize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}">
@@ -43,11 +43,11 @@
 
             <Button x:Name="PART_Max"
                     Uid="{Binding Maximize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
-                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Style="{DynamicResource Fluent.Ribbon.Styles.WindowCommands.CaptionButton}"
                     Padding="0"
                     controlzex:NonClientControlProperties.ClickStrategy="MouseEvent"
                     controlzex:NonClientControlProperties.HitTestResult="MAXBUTTON"
+                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Focusable="False"
                     SnapsToDevicePixels="True"
                     ToolTip="{Binding Maximize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
@@ -62,11 +62,11 @@
 
             <Button x:Name="PART_Restore"
                     Uid="{Binding Restore, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
-                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Style="{DynamicResource Fluent.Ribbon.Styles.WindowCommands.CaptionButton}"
                     Padding="0"
                     controlzex:NonClientControlProperties.ClickStrategy="MouseEvent"
                     controlzex:NonClientControlProperties.HitTestResult="MAXBUTTON"
+                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Focusable="False"
                     SnapsToDevicePixels="True"
                     ToolTip="{Binding Restore, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
@@ -81,11 +81,11 @@
 
             <Button x:Name="PART_Close"
                     Uid="{Binding Close, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}"
-                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Style="{DynamicResource Fluent.Ribbon.Styles.WindowCommands.CaptionButton}"
                     Padding="0"
                     controlzex:NonClientControlProperties.ClickStrategy="MouseEvent"
                     controlzex:NonClientControlProperties.HitTestResult="CLOSE"
+                    AutomationProperties.Name="{Binding Uid, RelativeSource={RelativeSource Self}}"
                     Focusable="False"
                     SnapsToDevicePixels="True"
                     ToolTip="{Binding Close, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:WindowCommands}}}">