rename dismiss button style

0x7c13 · Jun 16, 2024 · 38f2820 · 38f2820
1 parent f12a8b1
commit 38f2820
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/Notepads/App.xaml b/src/Notepads/App.xaml
@@ -22,7 +22,7 @@
                 <ResourceDictionary Source="Notepads.Controls/Themes/Generic.xaml" />
                 <ResourceDictionary Source="Controls/TextEditor/TextEditorCore.xaml" />
                 <ResourceDictionary Source="Controls/FindAndReplace/FindAndReplacePlaceholder.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="Resource/DismissButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="Resource/ChromelessIconButtonStyle.xaml" />
                 <ResourceDictionary Source="Resource/TransparentTextBoxStyle.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="Resource/CustomSplitViewStyle.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="Resource/InAppNotificationNoDismissButton.xaml"></ResourceDictionary>

diff --git a/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml b/src/Notepads/Controls/DiffViewer/SideBySideDiffViewer.xaml
@@ -39,7 +39,7 @@
             <Grid Grid.Row="0" Background="{ThemeResource HeaderBackgroundThemeBrush}">
                 <Button x:Name="DismissButton"
                         x:Uid="FindAndReplace_DismissButton"
-                        Style="{StaticResource DismissButtonStyle}"
+                        Style="{StaticResource ChromelessIconButtonStyle}"
                         Width="42"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Stretch"

diff --git a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
@@ -95,7 +95,7 @@
                 </Line>
                 <Button x:Name="OptionButton"
                         x:Uid="FindAndReplace_SearchOptionButton"
-                        Style="{StaticResource DismissButtonStyle}"
+                        Style="{StaticResource ChromelessIconButtonStyle}"
                         Width="32"
                         Height="32"
                         Content="&#xE712;"
@@ -145,7 +145,7 @@
             <Button x:Name="SearchBackwardButton"
                     x:Uid="FindAndReplace_SearchBackwardButton"
                     Grid.Column="0"
-                    Style="{StaticResource DismissButtonStyle}"
+                    Style="{StaticResource ChromelessIconButtonStyle}"
                     Width="36"
                     Height="32"
                     Content="&#xE74A;"
@@ -161,7 +161,7 @@
             <Button x:Name="SearchForwardButton"
                     x:Uid="FindAndReplace_SearchForwardButton"
                     Grid.Column="1"
-                    Style="{StaticResource DismissButtonStyle}"
+                    Style="{StaticResource ChromelessIconButtonStyle}"
                     Width="36"
                     Height="32"
                     Content="&#xE74B;"
@@ -177,7 +177,7 @@
             <Button x:Name="DismissButton"
                     x:Uid="FindAndReplace_DismissButton"
                     Grid.Column="2"
-                    Style="{StaticResource DismissButtonStyle}"
+                    Style="{StaticResource ChromelessIconButtonStyle}"
                     Width="36"
                     Height="32"
                     Content="&#xE894;"
@@ -218,7 +218,7 @@
                 <Button x:Name="ReplaceButton"
                         x:Uid="FindAndReplace_ReplaceButton"
                         Grid.Column="0"
-                        Style="{StaticResource DismissButtonStyle}"
+                        Style="{StaticResource ChromelessIconButtonStyle}"
                         Width="36"
                         Height="32"
                         Content="&#xE8AB;"
@@ -234,7 +234,7 @@
                 <Button x:Name="ReplaceAllButton"
                         x:Uid="FindAndReplace_ReplaceAllButton"
                         Grid.Column="1"
-                        Style="{StaticResource DismissButtonStyle}"
+                        Style="{StaticResource ChromelessIconButtonStyle}"
                         Width="36"
                         Height="32"
                         Content="&#xE7FD;"

diff --git a/src/Notepads/Controls/GoTo/GoToControl.xaml b/src/Notepads/Controls/GoTo/GoToControl.xaml
@@ -48,7 +48,7 @@
         <Button x:Name="SearchButton"
                 x:Uid="GoTo_SearchButton"
                 Grid.Column="2"
-                Style="{StaticResource DismissButtonStyle}"
+                Style="{StaticResource ChromelessIconButtonStyle}"
                 Width="36"
                 Height="32"
                 VerticalAlignment="Top"
@@ -62,7 +62,7 @@
         <Button x:Name="DismissButton"
                 x:Uid="FindAndReplace_DismissButton"
                 Grid.Column="3"
-                Style="{StaticResource DismissButtonStyle}"
+                Style="{StaticResource ChromelessIconButtonStyle}"
                 Width="36"
                 Height="32"
                 VerticalAlignment="Top"

diff --git a/src/Notepads/Notepads.csproj b/src/Notepads/Notepads.csproj
@@ -401,7 +401,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resource\DismissButtonStyle.xaml">
+    <Page Include="Resource\ChromelessIconButtonStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

diff --git a/...Notepads/Resource/DismissButtonStyle.xaml → ...s/Resource/ChromelessIconButtonStyle.xaml b/...Notepads/Resource/DismissButtonStyle.xaml → ...s/Resource/ChromelessIconButtonStyle.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="using:Notepads">
 
-    <Style x:Key="DismissButtonStyle" TargetType="Button">
+    <Style x:Key="ChromelessIconButtonStyle" TargetType="Button">
         <Setter Property="Background" Value="{ThemeResource SystemControlTransparentBrush}" />
         <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
         <Setter Property="BorderBrush" Value="{ThemeResource HyperlinkButtonBorderBrush}" />