Skip to content

Commit

Permalink
Adding Selected.MouseOver.Foreground for #578
Browse files Browse the repository at this point in the history
  • Loading branch information
batzen committed Aug 8, 2018
1 parent afd8e2f commit 264a686
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Fluent.Ribbon/Themes/Controls/RibbonTabItem.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,11 @@
<Setter Property="BorderBrush"
Value="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabItem.BorderBrush}" />
</Trigger>
<Trigger Property="IsSelected"
Value="True">
<Setter Property="Fluent:RibbonProperties.MouseOverForeground"
Value="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground}" />
</Trigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding IsContextual, RelativeSource={RelativeSource Self}}"
Expand Down
6 changes: 4 additions & 2 deletions Fluent.Ribbon/Themes/Themes/GeneratorParameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"Fluent.Ribbon.Brushes.RibbonTabItem.Foreground": "{StaticResource Gray5}",
"Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background": "#363636",
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background": "#444444",
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground": "{StaticResource BlackColor}"
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground": "{StaticResource BlackColor}",
"Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground": "{StaticResource BlackColor}"
}
},
{
Expand Down Expand Up @@ -82,7 +83,8 @@
"Fluent.Ribbon.Brushes.RibbonTabItem.Foreground": "{StaticResource BlackColor}",
"Fluent.Ribbon.Brushes.RibbonTabItem.Active.Background": "{StaticResource WhiteColor}",
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background": "Transparent",
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground": "{StaticResource Fluent.Ribbon.Colors.HighlightColor}"
"Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground": "{StaticResource Fluent.Ribbon.Colors.HighlightColor}",
"Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground": "{StaticResource Fluent.Ribbon.Colors.HighlightColor}"
}
}
],
Expand Down
1 change: 1 addition & 0 deletions Fluent.Ribbon/Themes/Themes/Theme.Template.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Background}}" options:Freeze="True" />
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.MouseOver.Foreground}}" options:Freeze="True" />
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Selected.Foreground" Color="{StaticResource Gray1}" options:Freeze="True" />
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground" Color="{{Fluent.Ribbon.Brushes.RibbonTabItem.Selected.MouseOver.Foreground}}" options:Freeze="True" />

<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Contextual.Background.OpacityMask" Color="#14000000" options:Freeze="True" />

Expand Down

0 comments on commit 264a686

Please sign in to comment.