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

#1070 Separators no longer shown in Backstage #1072

Merged
merged 2 commits into from
Oct 15, 2022
Merged

#1070 Separators no longer shown in Backstage #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f03977
Fixes #1070
batzen Oct 8, 2022
550a319
Simplifying condition
batzen Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

- [#1035](../../issues/1035) - Binding failures from within RibbonTabItem on IsMinimized & IsOpen
- [#1041](../../issues/1041) - MenuItem CreateQuickAccessItem should create ToggleButton (thanks @andersforsgren)
- [#1070](../../issues/1070) - Separators no longer shown in Backstage (related to #936)

- ### Enhancements/Features

Expand Down
2 changes: 1 addition & 1 deletion Fluent.Ribbon.Showcase/TestContent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
</TabControl>
</Fluent:BackstageTabItem>

<Fluent:SeparatorTabItem />
<Separator />

<Fluent:Button Header="Exit"
VerticalAlignment="Bottom"
Expand Down
11 changes: 11 additions & 0 deletions Fluent.Ribbon/Controls/BackstageTabControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,17 @@ or SeparatorTabItem
or Separator;
}

/// <inheritdoc />
protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
{
if (element.ReadLocalValue(DockPanel.DockProperty) == DependencyProperty.UnsetValue)
{
element.SetCurrentValue(DockPanel.DockProperty, Dock.Top);
}

base.PrepareContainerForItemOverride(element, item);
}

/// <inheritdoc />
protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
{
Expand Down
8 changes: 3 additions & 5 deletions Fluent.Ribbon/Themes/Controls/Backstage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@
</Grid>
</Border>
<ControlTemplate.Triggers>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsMouseOver" Value="True" />
</MultiTrigger.Conditions>
<Trigger Property="IsMouseOver"
Value="True">
<Setter TargetName="rectangle" Property="Fill" Value="{DynamicResource Fluent.Ribbon.Brushes.HighTransparentWhite}" />
</MultiTrigger>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="border2" Property="Opacity" Value="0.5" />
<Setter TargetName="contentPresenter" Property="Effect">
Expand Down
3 changes: 0 additions & 3 deletions Fluent.Ribbon/Themes/Controls/BackstageTabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

<Style x:Key="Fluent.Ribbon.Styles.BackstageTabControl.Button"
TargetType="{x:Type Fluent:Button}">
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Fluent:RibbonProperties.IconSize" Value="Small" />
<Setter Property="Fluent:RibbonProperties.MouseOverBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background}" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />
Expand Down Expand Up @@ -115,7 +114,6 @@
<Style x:Key="Fluent.Ribbon.Styles.BackstageBackButton"
TargetType="{x:Type Button}">
<Setter Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.Backstage.BackButton.Background}" />
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />
<Setter Property="Foreground" Value="{DynamicResource Fluent.Ribbon.Brushes.Backstage.BackButton.Foreground}" />
<Setter Property="Height" Value="48" />
Expand All @@ -125,7 +123,6 @@

<Style x:Key="Fluent.Ribbon.Styles.BackstageTabControl.SeparatorTabItem"
TargetType="{x:Type Fluent:SeparatorTabItem}">
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Focusable" Value="False" />
<Setter Property="Margin" Value="25 10 20 10" />
<Setter Property="Template">
Expand Down
1 change: 0 additions & 1 deletion Fluent.Ribbon/Themes/Controls/BackstageTabItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<Style x:Key="Fluent.Ribbon.Styles.BackstageTabItem"
TargetType="{x:Type Fluent:BackstageTabItem}">
<Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:BackstageTabControl}}}" />
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Fluent:RibbonProperties.IsSelectedBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.Selected.Background}" />
<Setter Property="Fluent:RibbonProperties.MouseOverBackground" Value="{DynamicResource Fluent.Ribbon.Brushes.BackstageTabItem.MouseOver.Background}" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource Fluent.Ribbon.Styles.ControlStyleEmptyFocus}" />
Expand Down