Change of the background color to same color of title bar.
And class name to Glass.Dark, plus a fix in the ColorPalette.axaml.
This commit is contained in:
parent
bd5b053a59
commit
2813e682dd
3 changed files with 18 additions and 13 deletions
|
|
@ -137,10 +137,10 @@
|
|||
<Color x:Key="ButtonGlassHoverBg">#1AFFFFFF</Color>
|
||||
<Color x:Key="ButtonGlassPressedBg">#2AFFFFFF</Color>
|
||||
|
||||
<!-- Button - Glass-Back -->
|
||||
<Color x:Key="ButtonGlassBackBg">#CC111111</Color>
|
||||
<Color x:Key="ButtonGlassBackHoverBg">#EE111111</Color>
|
||||
<Color x:Key="ButtonGlassBackPressedBg">#FF111111</Color>
|
||||
<!-- Button - Glass.Dark -->
|
||||
<Color x:Key="ButtonGlassDarkBg">#80000000</Color>
|
||||
<Color x:Key="ButtonGlassDarkHoverBg">#EE111111</Color>
|
||||
<Color x:Key="ButtonGlassDarkPressedBg">#FF111111</Color>
|
||||
|
||||
<!-- Button - Shared -->
|
||||
<Color x:Key="ButtonDisabledBg">#14FFFFFF</Color>
|
||||
|
|
@ -184,10 +184,15 @@
|
|||
|
||||
<SolidColorBrush x:Key="ButtonTextHoverBgBrush" Color="{StaticResource ButtonTextHoverBg}" />
|
||||
<SolidColorBrush x:Key="ButtonTextPressedBgBrush" Color="{StaticResource ButtonTextPressedBg}" />
|
||||
|
||||
<SolidColorBrush x:Key="ButtonGlassBgBrush" Color="{StaticResource ButtonGlassBg}" />
|
||||
<SolidColorBrush x:Key="ButtonGlassHoverBgBrush" Color="{StaticResource ButtonGlassHoverBg}" />
|
||||
<SolidColorBrush x:Key="ButtonGlassPressedBgBrush" Color="{StaticResource ButtonGlassPressedBg}" />
|
||||
|
||||
<SolidColorBrush x:Key="ButtonGlassDarkBgBrush" Color="{StaticResource ButtonGlassDarkBg}" />
|
||||
<SolidColorBrush x:Key="ButtonGlassDarkHoverBgBrush" Color="{StaticResource ButtonGlassDarkHoverBg}" />
|
||||
<SolidColorBrush x:Key="ButtonGlassDarkPressedBgBrush" Color="{StaticResource ButtonGlassDarkPressedBg}" />
|
||||
|
||||
<SolidColorBrush x:Key="ButtonDisabledBgBrush" Color="{StaticResource ButtonDisabledBg}" />
|
||||
<SolidColorBrush x:Key="ButtonDisabledTextBrush" Color="{StaticResource ButtonDisabledText}" />
|
||||
|
||||
|
|
|
|||
|
|
@ -501,19 +501,19 @@
|
|||
<Setter Property="Background" Value="{DynamicResource ButtonGlassPressedBgBrush}" />
|
||||
</Style>
|
||||
|
||||
<Style Selector="Button.Glass-Back, local|IconButton.Glass-Back">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassBackBg}" />
|
||||
<Style Selector="Button.Glass.Dark, local|IconButton.Glass.Dark">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassDarkBgBrush}" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="CornerRadius" Value="4" />
|
||||
</Style>
|
||||
<Style Selector="Button.Glass-Back:pointerover /template/ ContentPresenter#PART_ContentPresenter,
|
||||
local|IconButton.Glass-Back:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassBackHoverBg}" />
|
||||
<Style Selector="Button.Glass.Dark:pointerover /template/ ContentPresenter#PART_ContentPresenter,
|
||||
local|IconButton.Glass.Dark:pointerover /template/ ContentPresenter#PART_ContentPresenter">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassDarkHoverBgBrush}" />
|
||||
</Style>
|
||||
<Style Selector="Button.Glass-Back:pressed /template/ ContentPresenter#PART_ContentPresenter,
|
||||
local|IconButton.Glass-Back:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassBackPressedBg}" />
|
||||
<Style Selector="Button.Glass.Dark:pressed /template/ ContentPresenter#PART_ContentPresenter,
|
||||
local|IconButton.Glass.Dark:pressed /template/ ContentPresenter#PART_ContentPresenter">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGlassDarkPressedBgBrush}" />
|
||||
</Style>
|
||||
|
||||
<!-- ===================================================== -->
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
<!-- Back button (overlaid at top-left, below title bar) -->
|
||||
<IconButton Command="{Binding GoBackCommand}"
|
||||
Text="{Binding BackLabel}"
|
||||
Classes="Glass-Back"
|
||||
Classes="Glass Dark"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Margin="16, 48, 0, 0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue