Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 12:18:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

[PowerRename]Update apply button style for a clearer enabled look (#31353)

Browse Source 
* Updating SplitButtonStyle

* Remove unused brushes
This commit is contained in:
Niels Laute
2024-02-08 15:41:58 +01:00
committed by GitHub
parent dec535e4c4
commit 3d39107e02
2 changed files with 202 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

319
src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
View File

@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"> xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
@@ -11,11 +12,109 @@
<!-- Other merged dictionaries here --> <!-- Other merged dictionaries here -->
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<!-- Other app resources here --> <!-- Other app resources here -->
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<StaticResource x:Key="AccentSplitButtonBackground" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundChecked" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPointerOver" ResourceKey="AccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPressed" ResourceKey="AccentFillColorTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedDisabled" ResourceKey="AccentFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonForeground" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundChecked" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedDisabled" ResourceKey="AccentTextFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondary" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondaryPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrush" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDisabled" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDivider" ResourceKey="ControlStrokeColorOnAccentTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushChecked" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPressed" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDisabled" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDivider" ResourceKey="ControlStrokeColorOnAccentTertiaryBrush" />
<Thickness x:Key="AccentSplitButtonBorderThemeThickness">1</Thickness>
<StaticResource x:Key="AccentSplitButtonInAppBarUnfocusedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="AccentSplitButtonBackground" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundChecked" ResourceKey="AccentFillColorDefaultBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPointerOver" ResourceKey="AccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPressed" ResourceKey="AccentFillColorTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedDisabled" ResourceKey="AccentFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonForeground" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundDisabled" ResourceKey="TextOnAccentFillColorDisabled" />
<StaticResource x:Key="AccentSplitButtonForegroundChecked" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedDisabled" ResourceKey="AccentTextFillColorDisabledBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondary" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondaryPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrush" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDisabled" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDivider" ResourceKey="ControlStrokeColorOnAccentTertiaryBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushChecked" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPressed" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDisabled" ResourceKey="ControlFillColorTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDivider" ResourceKey="ControlStrokeColorOnAccentTertiaryBrush" />
<Thickness x:Key="AccentSplitButtonBorderThemeThickness">1</Thickness>
<StaticResource x:Key="AccentSplitButtonInAppBarUnfocusedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<StaticResource x:Key="AccentSplitButtonBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundDisabled" ResourceKey="SystemColorWindowColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundChecked" ResourceKey="SystemColorHighlightColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPointerOver" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedPressed" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="AccentSplitButtonBackgroundCheckedDisabled" ResourceKey="SystemColorGrayTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundDisabled" ResourceKey="SystemColorGrayTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundChecked" ResourceKey="SystemColorHighlightTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPointerOver" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedPressed" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundCheckedDisabled" ResourceKey="SystemColorWindowColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondary" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonForegroundSecondaryPressed" ResourceKey="SystemColorHighlightColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushPressed" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushDivider" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushChecked" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPointerOver" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedPressed" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDisabled" ResourceKey="SystemColorGrayTextColorBrush" />
<StaticResource x:Key="AccentSplitButtonBorderBrushCheckedDivider" ResourceKey="SystemColorHighlightTextColorBrush" />
<Thickness x:Key="AccentSplitButtonBorderThemeThickness">1</Thickness>
<StaticResource x:Key="AccentSplitButtonInAppBarUnfocusedPointerOver" ResourceKey="SystemColorButtonFaceColorBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<Style x:Key="SplitAccentButtonStyle" TargetType="SplitButton"> <Style x:Key="AccentSplitButtonStyle" TargetType="controls:SplitButton">
<!--<Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" />--> <Setter Property="Background" Value="{ThemeResource AccentSplitButtonBackground}" />
<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" /> <Setter Property="Foreground" Value="{ThemeResource AccentSplitButtonForeground}" />
<Setter Property="BorderBrush" Value="{ThemeResource AccentButtonBorderBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrush}" />
<Setter Property="BorderThickness" Value="{ThemeResource SplitButtonBorderThemeThickness}" /> <Setter Property="BorderThickness" Value="{ThemeResource SplitButtonBorderThemeThickness}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
@@ -24,20 +123,20 @@
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" /> <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
<Setter Property="UseSystemFocusVisuals" Value="True" /> <Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="FocusVisualMargin" Value="-1" /> <Setter Property="FocusVisualMargin" Value="-1" />
<Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
<Setter Property="IsTabStop" Value="True" /> <Setter Property="IsTabStop" Value="True" />
<Setter Property="Padding" Value="{ThemeResource ButtonPadding}" /> <Setter Property="Padding" Value="{ThemeResource ButtonPadding}" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="SplitButton"> <ControlTemplate TargetType="controls:SplitButton">
<Grid <Grid
x:Name="RootGrid" x:Name="RootGrid"
Background="{ThemeResource AccentButtonBackground}" Background="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid.Resources> <Grid.Resources>
<!-- Override the style of the inner buttons so that they don't affect background/foreground/border colors --> <!-- Override the style of the inner buttons so that they don't affect background/foreground/border colors -->
<Style TargetType="Button"> <Style TargetType="Button">
<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" /> <Setter Property="Foreground" Value="{ThemeResource AccentSplitButtonForeground}" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="{ThemeResource SplitButtonBorderThemeThickness}" /> <Setter Property="BorderThickness" Value="{ThemeResource SplitButtonBorderThemeThickness}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
@@ -52,36 +151,36 @@
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<Grid x:Name="RootGrid" Background="Transparent"> <Grid x:Name="RootGrid" Background="Transparent">
<ContentPresenter <ContentPresenter
xmlns:local="using:Microsoft.UI.Xaml.Controls"
x:Name="ContentPresenter" x:Name="ContentPresenter"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
AnimatedIcon.State="Normal" local:AnimatedIcon.State="Normal"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTransitions="{TemplateBinding ContentTransitions}" /> ContentTransitions="{TemplateBinding ContentTransitions}"
Foreground="{TemplateBinding Foreground}"
Opacity="1" />
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver"> <VisualState x:Name="PointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" /> <Setter Target="ContentPresenter.(controls:AnimatedIcon.State)" Value="PointerOver" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Pressed"> <VisualState x:Name="Pressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" /> <Setter Target="ContentPresenter.(controls:AnimatedIcon.State)" Value="Pressed" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="RootGrid.Background" Value="{ThemeResource AccentButtonBackgroundDisabled}" /> <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedDisabled}" />
<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushDisabled}" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource AccentButtonForeground}" />
<Setter Target="ContentPresenter.Opacity" Value="0.4" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@@ -92,7 +191,6 @@
</Setter> </Setter>
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition <ColumnDefinition
x:Name="PrimaryButtonColumn" x:Name="PrimaryButtonColumn"
@@ -101,30 +199,19 @@
<ColumnDefinition x:Name="Separator" Width="1" /> <ColumnDefinition x:Name="Separator" Width="1" />
<ColumnDefinition x:Name="SecondaryButtonColumn" Width="{ThemeResource SplitButtonSecondaryButtonSize}" /> <ColumnDefinition x:Name="SecondaryButtonColumn" Width="{ThemeResource SplitButtonSecondaryButtonSize}" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid <Grid
x:Name="PrimaryBackgroundGrid" x:Name="PrimaryBackgroundGrid"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Background="{TemplateBinding Background}" /> Background="{TemplateBinding Background}" />
<Grid <Grid
x:Name="DividerBackgroundGrid" x:Name="DividerBackgroundGrid"
Grid.Column="1" Grid.Column="1"
Width="1" Width="1"
Background="{ThemeResource AccentButtonBorderBrush}" /> Background="{ThemeResource AccentSplitButtonBorderBrushDivider}" />
<Grid <Grid
x:Name="SecondaryBackgroundGrid" x:Name="SecondaryBackgroundGrid"
Grid.Column="2" Grid.Column="2"
Background="{TemplateBinding Background}" /> Background="{TemplateBinding Background}" />
<Grid
x:Name="Border"
Grid.ColumnSpan="3"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" />
<Button <Button
x:Name="PrimaryButton" x:Name="PrimaryButton"
Grid.Column="0" Grid.Column="0"
@@ -147,7 +234,6 @@
FontWeight="{TemplateBinding FontWeight}" FontWeight="{TemplateBinding FontWeight}"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
IsTabStop="False" /> IsTabStop="False" />
<Button <Button
x:Name="SecondaryButton" x:Name="SecondaryButton"
Grid.Column="2" Grid.Column="2"
@@ -160,166 +246,163 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="Transparent" BorderBrush="Transparent"
BorderThickness="0" BorderThickness="0"
Foreground="{ThemeResource AccentButtonForeground}" Foreground="{ThemeResource AccentSplitButtonForegroundSecondary}"
IsTabStop="False"> IsTabStop="False">
<Button.Content> <Button.Content>
<AnimatedIcon <controls:AnimatedIcon
Width="12" Width="12"
Height="12" Height="12"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<animatedVisuals:AnimatedChevronDownSmallVisualSource /> <animatedVisuals:AnimatedChevronDownSmallVisualSource />
<AnimatedIcon.FallbackIconSource> <controls:AnimatedIcon.FallbackIconSource>
<FontIconSource <controls:FontIconSource
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="8" FontSize="8"
Glyph="&#xE96E;" Glyph="&#xE96E;"
IsTextScaleFactorEnabled="False" /> IsTextScaleFactorEnabled="False" />
</AnimatedIcon.FallbackIconSource> </controls:AnimatedIcon.FallbackIconSource>
</AnimatedIcon> </controls:AnimatedIcon>
</Button.Content> </Button.Content>
</Button> </Button>
<Grid
x:Name="Border"
Grid.ColumnSpan="3"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" />
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushDisabled}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundDisabled}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundDisabled}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="FlyoutOpen"> <VisualState x:Name="FlyoutOpen">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="Border.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushPressed}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundSecondaryPressed}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="TouchPressed"> <VisualState x:Name="TouchPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="Border.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushPressed}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundSecondaryPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundSecondaryPressed}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="PrimaryPointerOver"> <VisualState x:Name="PrimaryPointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPointerOver}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPointerOver}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPointerOver}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundPointerOver}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackground}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackground}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="PrimaryPressed"> <VisualState x:Name="PrimaryPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackground}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackground}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SecondaryPointerOver"> <VisualState x:Name="SecondaryPointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackground}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackground}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPointerOver}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPointerOver}" />
<Setter Target="SecondaryButton.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushPointerOver}" /> <Setter Target="SecondaryButton.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushPointerOver}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPointerOver}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundPointerOver}" />
<Setter Target="DividerBackgroundGrid.Background" Value="Transparent" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPointerOver}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SecondaryPressed"> <VisualState x:Name="SecondaryPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackground}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackground}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundSecondaryPressed}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Checked"> <VisualState x:Name="Checked">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushChecked}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushChecked}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedFlyoutOpen"> <VisualState x:Name="CheckedFlyoutOpen">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="Border.BorderBrush" Value="{ThemeResource AccentButtonBorderBrushPressed}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedTouchPressed"> <VisualState x:Name="CheckedTouchPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushCheckedPressed}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundCheckedPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundCheckedPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedPrimaryPointerOver"> <VisualState x:Name="CheckedPrimaryPointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushChecked}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushChecked}" />
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPointerOver}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPointerOver}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPointerOver}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPointerOver}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedPrimaryPressed"> <VisualState x:Name="CheckedPrimaryPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushChecked}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushChecked}" />
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundCheckedPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundChecked}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedSecondaryPointerOver"> <VisualState x:Name="CheckedSecondaryPointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushChecked}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushChecked}" />
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource SplitButtonForegroundChecked}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundCheckedPointerOver}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPointerOver}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPointerOver}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPointerOver}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="CheckedSecondaryPressed"> <VisualState x:Name="CheckedSecondaryPressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushChecked}" /> <Setter Target="Border.BorderBrush" Value="{ThemeResource AccentSplitButtonBorderBrushChecked}" />
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundChecked}" /> <Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundChecked}" />
<Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="PrimaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundChecked}" />
<Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentButtonBackgroundPressed}" /> <Setter Target="SecondaryBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBackgroundCheckedPressed}" />
<Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentButtonForegroundPressed}" /> <Setter Target="SecondaryButton.Foreground" Value="{ThemeResource AccentSplitButtonForegroundCheckedPressed}" />
<Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource SplitButtonBorderBrushCheckedDivider}" /> <Setter Target="DividerBackgroundGrid.Background" Value="{ThemeResource AccentSplitButtonBorderBrushCheckedDivider}" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
<VisualStateGroup x:Name="SecondaryButtonPlacementStates"> <VisualStateGroup x:Name="SecondaryButtonPlacementStates">
<VisualState x:Name="SecondaryButtonRight" /> <VisualState x:Name="SecondaryButtonRight" />
<VisualState x:Name="SecondaryButtonSpan"> <VisualState x:Name="SecondaryButtonSpan">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SecondaryButton.(Grid.Column)" Value="0" /> <Setter Target="SecondaryButton.(Grid.Column)" Value="0" />

2
src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
View File

@@ -593,7 +593,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Click="button_rename_Click" Click="button_rename_Click"
Style="{StaticResource SplitAccentButtonStyle}"> Style="{StaticResource AccentSplitButtonStyle}">
<SplitButton.KeyboardAccelerators> <SplitButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Enter" /> <KeyboardAccelerator Key="Enter" />
<KeyboardAccelerator Key="Enter" Modifiers="Control" /> <KeyboardAccelerator Key="Enter" Modifiers="Control" />