Skip to content

Commit 9d737ae

Browse files
committed
Adding back Fluent.Ribbon.Styles.GroupBoxSeparator
1 parent 8281c44 commit 9d737ae

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

Fluent.Ribbon.Showcase/TestContent.xaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2063,11 +2063,16 @@
20632063
<Fluent:TextBox Header="My short header" />
20642064
<Fluent:Spinner Header="My long long header" />
20652065

2066+
<Separator Style="{DynamicResource Fluent.Ribbon.Styles.GroupBoxSeparator}" />
2067+
20662068
<Fluent:ComboBox Header="Excluded from size sharing"
20672069
Fluent:RibbonGroupBoxWrapPanel.ExcludeFromSharedSize="True" />
20682070
<Fluent:Spinner Header="My short header" />
20692071
<Fluent:ComboBox Header="My long long header" />
20702072

2073+
<Separator Style="{DynamicResource Fluent.Ribbon.Styles.GroupBoxSeparator}"
2074+
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
2075+
20712076
<Fluent:ComboBox Header="Test"
20722077
Fluent:InputControlProperties.InputWidth="120"
20732078
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}">
@@ -2084,6 +2089,9 @@
20842089
<Fluent:ComboBox Header="Test"
20852090
Fluent:InputControlProperties.InputWidth="120" />
20862091

2092+
<Separator Style="{DynamicResource Fluent.Ribbon.Styles.GroupBoxSeparator}"
2093+
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
2094+
20872095
<Fluent:ComboBox Header="Test"
20882096
Fluent:InputControlProperties.InputWidth="120"
20892097
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
@@ -2093,6 +2101,9 @@
20932101
<Fluent:ComboBox Header="Test"
20942102
Fluent:InputControlProperties.InputWidth="120" />
20952103

2104+
<Separator Style="{DynamicResource Fluent.Ribbon.Styles.GroupBoxSeparator}"
2105+
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
2106+
20962107
<Fluent:ComboBox Header="Test"
20972108
Fluent:InputControlProperties.InputWidth="120"
20982109
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
@@ -2102,6 +2113,9 @@
21022113
<Fluent:ComboBox Header="Test"
21032114
Fluent:InputControlProperties.InputWidth="120" />
21042115

2116+
<Separator Style="{DynamicResource Fluent.Ribbon.Styles.GroupBoxSeparator}"
2117+
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
2118+
21052119
<Fluent:ComboBox Header="Test"
21062120
Fluent:InputControlProperties.InputWidth="120"
21072121
Visibility="{Binding IsChecked, ElementName=ShowDetailButton, Converter={StaticResource Fluent.Ribbon.Converters.BoolToVisibilityConverter}}" />
@@ -3313,7 +3327,7 @@
33133327

33143328
<StackPanel Orientation="Horizontal">
33153329
<Label>
3316-
WindowBackDropType
3330+
BackDropType
33173331
</Label>
33183332
<ComboBox VerticalAlignment="Center"
33193333
ItemsSource="{Binding Source={StaticResource WindowBackdropTypeEnumValues}}"

Fluent.Ribbon/Themes/Controls/RibbonGroupBox.xaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,29 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:templateSelectors="clr-namespace:Fluent.TemplateSelectors"
88
mc:Ignorable="d">
9+
<Style x:Key="Fluent.Ribbon.Styles.GroupBoxSeparator"
10+
TargetType="Separator">
11+
<Setter Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.Separator.Background}" />
12+
<Setter Property="Template">
13+
<Setter.Value>
14+
<ControlTemplate TargetType="Separator">
15+
<Border x:Name="SeparatorBorder"
16+
Width="1"
17+
Height="55"
18+
Margin="2 5 2 10"
19+
HorizontalAlignment="Center"
20+
VerticalAlignment="Center"
21+
Background="{TemplateBinding Background}" />
22+
<ControlTemplate.Triggers>
23+
<DataTrigger Binding="{Binding IsSimplified, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Fluent:RibbonGroupBox}}, FallbackValue=False}" Value="True">
24+
<Setter TargetName="SeparatorBorder" Property="Height" Value="Auto" />
25+
</DataTrigger>
26+
</ControlTemplate.Triggers>
27+
</ControlTemplate>
28+
</Setter.Value>
29+
</Setter>
30+
</Style>
31+
932
<DataTemplate x:Key="Fluent.Ribbon.DataTemplates.RibbonGroupBox.OneLineHeader">
1033
<TextBlock HorizontalAlignment="Stretch"
1134
VerticalAlignment="Center"

0 commit comments

Comments
 (0)