Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve ToolbarButtonStyle #3743

Merged
merged 17 commits into from Feb 18, 2020
Merged

Improve ToolbarButtonStyle #3743

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d5c3750
Merge pull request #1 from MahApps/develop
timunie Jul 12, 2019
ecb1dcd
Merge pull request #3 from MahApps/develop
timunie Jul 27, 2019
b8465e8
Merge pull request #4 from MahApps/develop
timunie Sep 5, 2019
bee3fe6
Merge remote-tracking branch 'upstream/develop' into develop
timunie Sep 23, 2019
34a3574
Merge remote-tracking branch 'upstream/develop' into develop
timunie Oct 6, 2019
720e1ac
Merge remote-tracking branch 'upstream/develop' into develop
timunie Oct 25, 2019
7ab5e9c
Merge remote-tracking branch 'upstream/develop' into develop
timunie Nov 8, 2019
9574483
Merge remote-tracking branch 'upstream/develop' into develop
timunie Nov 10, 2019
3a4b9a1
Merge remote-tracking branch 'upstream/develop' into develop
timunie Nov 10, 2019
8f81c4d
Merge remote-tracking branch 'upstream/develop' into develop
timunie Nov 20, 2019
7022a14
Merge remote-tracking branch 'upstream/develop' into develop
timunie Nov 29, 2019
3fbf5ae
Merge remote-tracking branch 'upstream/develop' into develop
timunie Dec 6, 2019
e36f627
Merge remote-tracking branch 'upstream/develop' into develop
timunie Jan 5, 2020
03e0ad8
Merge remote-tracking branch 'upstream/develop' into develop
timunie Feb 12, 2020
d87a0a3
Merge remote-tracking branch 'upstream/develop' into develop
timunie Feb 17, 2020
b78afdb
(GH-3741) Improve ToolBar Button styles
timunie Feb 17, 2020
e0f1b92
(GH-3741) Don't use FlatButton foreground brushes
punker76 Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
150 changes: 118 additions & 32 deletions src/MahApps.Metro/Styles/Controls.Toolbar.xaml
View file
Open in desktop
Expand Up @@ -19,58 +19,144 @@
</Style.Triggers>
</Style>
</Style.Resources>
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FocusVisualStyle.Flat}" />
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Button.Flat}" />
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="Padding" Value="10 5 10 5" />
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ButtonBase}">
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="Border"
Background="{DynamicResource MahApps.Brushes.TransparentWhite}"
BorderBrush="{DynamicResource MahApps.Brushes.TransparentWhite}"
BorderThickness="1">
<ContentPresenter Margin="2"
HorizontalAlignment="Center"
VerticalAlignment="Center"
RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}" />
Margin="0"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<controls:ContentControlEx x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ContentCharacterCasing)}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="VerticalContentAlignment" Value="Center" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="MahApps.Styles.ToggleButton.ToolBar" TargetType="{x:Type ToggleButton}">
<Style.Resources>
<!-- Disabled all images placed inside a button - most common scenario -->
<Style TargetType="Image">
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.5" />
</Trigger>
</Style.Triggers>
</Style>
</Style.Resources>
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FocusVisualStyle.Flat}" />
<Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Button.Flat}" />
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="Padding" Value="10 5 10 5" />
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="Border"
Margin="0"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding controls:ControlsHelper.CornerRadius}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<controls:ContentControlEx x:Name="PART_ContentPresenter"
Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ContentCharacterCasing)}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="true">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
</Trigger>
<Trigger Property="CheckBox.IsChecked" Value="true">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="VerticalContentAlignment" Value="Center" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
</Trigger>
</Style.Triggers>
</Style>


<!-- Style for all types of regular buttons -->
<Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
TargetType="{x:Type Button}" />
<Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
BasedOn="{StaticResource MahApps.Styles.ToggleButton.ToolBar}"
TargetType="{x:Type ToggleButton}" />
<Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
BasedOn="{StaticResource MahApps.Styles.ToggleButton.ToolBar}"
TargetType="{x:Type CheckBox}" />
<Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
BasedOn="{StaticResource MahApps.Styles.ToggleButton.ToolBar}"
TargetType="{x:Type RadioButton}" />

<!-- Style for text box inside a toolbar if needed -->
Expand Down