Skip to content

TabControl, TabItem enhancement #3330

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

Merged
merged 4 commits into from
Sep 14, 2018
Merged

TabControl, TabItem enhancement #3330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd34ed5
TabItem attached properties `HeaderFontSize`, `HeaderFontStretch` and…
punker76 Sep 13, 2018
d83a418
add a new attached property `HeaderFontFamily`
punker76 Sep 14, 2018
fc6b529
(GH-3329) Fix Windows 10 Maximize icon is slightly broken on high res…
punker76 Sep 14, 2018
aeb738b
XamlStyler again
punker76 Sep 14, 2018
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
4 changes: 2 additions & 2 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MahApps.Metro.Styles.Slider.Win10}" />

<Style BasedOn="{StaticResource MahApps.Metro.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />

<Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
<Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
Expand Down
5 changes: 2 additions & 3 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
SelectedIndex="0"
Style="{StaticResource VirtualisedMetroListBox}" />

<ListBox Margin="2"
SelectedIndex="0">
<ListBox Margin="2" SelectedIndex="0">
<ListBoxItem Content="Item 1" />
<ListBoxItem Content="Item 2" />
<ListBoxItem Content="Item 3" />
Expand Down Expand Up @@ -70,7 +69,7 @@
</GridView>
</ListView.View>
</ListView>

<ListView Margin="2"
SelectedIndex="0"
Style="{StaticResource VirtualisedMetroListView}">
Expand Down
14 changes: 8 additions & 6 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,26 @@
SelectedItem="{x:Static Dock.Top}" />
</StackPanel>
<TabControl Height="200"
Controls:ControlsHelper.HeaderFontFamily="Segoe Script"
Controls:ControlsHelper.HeaderFontSize="18"
Controls:TabControlHelper.Underlined="{Binding ElementName=UnderlinedComboBox, Path=SelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
TabStripPlacement="{Binding ElementName=TabStripPlacementComboBox, Path=SelectedItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _1">
<TabItem Header="Item _1">
<TextBlock FontSize="30" Text="Content" />
</TabItem>
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _2">
<TabItem Header="Item _2">
<TextBlock FontSize="30" Text="More content" />
</TabItem>
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _3">
<TabItem Header="Item _3">
<TextBlock FontSize="30" Text="More more content" />
</TabItem>
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _4">
<TabItem Header="Item _4">
<TextBlock FontSize="30" Text="So much content!" />
</TabItem>
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _5">
<TabItem Header="Item _5">
<TextBlock FontSize="30" Text="Content!" />
</TabItem>
<TabItem Controls:ControlsHelper.HeaderFontSize="18" Header="item _6">
<TabItem Header="Item _6">
<TextBlock FontSize="30" Text="This is not content (it is)" />
</TabItem>
</TabControl>
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
<Controls:Flyout x:Name="settingsFlyout"
Margin="200 30 0 0"
Controls:ControlsHelper.ContentCharacterCasing="Upper"
Controls:ControlsHelper.HeaderFontFamily="Segoe Script"
AreAnimationsEnabled="True"
FocusedElement="{Binding ElementName=firstTB}"
Header="Settings"
Expand Down
27 changes: 24 additions & 3 deletions src/MahApps.Metro/Controls/Helper/ControlsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Documents;
using System.Windows.Media;

namespace MahApps.Metro.Controls
Expand Down Expand Up @@ -65,11 +66,29 @@ public static void SetContentCharacterCasing(UIElement element, CharacterCasing
element.SetValue(ContentCharacterCasingProperty, value);
}

public static readonly DependencyProperty HeaderFontFamilyProperty =
DependencyProperty.RegisterAttached("HeaderFontFamily", typeof(FontFamily), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontFamily));

[Category(AppName.MahApps)]
[AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
[AttachedPropertyBrowsableForType(typeof(TabControl))]
[AttachedPropertyBrowsableForType(typeof(Flyout))]
public static FontFamily GetHeaderFontFamily(UIElement element)
{
return (FontFamily)element.GetValue(HeaderFontFamilyProperty);
}

public static void SetHeaderFontFamily(UIElement element, FontFamily value)
{
element.SetValue(HeaderFontFamilyProperty, value);
}

public static readonly DependencyProperty HeaderFontSizeProperty =
DependencyProperty.RegisterAttached("HeaderFontSize", typeof(double), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontSize) { Inherits = true });
DependencyProperty.RegisterAttached("HeaderFontSize", typeof(double), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontSize));

[Category(AppName.MahApps)]
[AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
[AttachedPropertyBrowsableForType(typeof(TabControl))]
[AttachedPropertyBrowsableForType(typeof(Flyout))]
public static double GetHeaderFontSize(UIElement element)
{
Expand All @@ -82,10 +101,11 @@ public static void SetHeaderFontSize(UIElement element, double value)
}

public static readonly DependencyProperty HeaderFontStretchProperty =
DependencyProperty.RegisterAttached("HeaderFontStretch", typeof(FontStretch), typeof(ControlsHelper), new UIPropertyMetadata(FontStretches.Normal));
DependencyProperty.RegisterAttached("HeaderFontStretch", typeof(FontStretch), typeof(ControlsHelper), new FrameworkPropertyMetadata(TextElement.FontStretchProperty.DefaultMetadata.DefaultValue));

[Category(AppName.MahApps)]
[AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
[AttachedPropertyBrowsableForType(typeof(TabControl))]
[AttachedPropertyBrowsableForType(typeof(Flyout))]
public static FontStretch GetHeaderFontStretch(UIElement element)
{
Expand All @@ -98,10 +118,11 @@ public static void SetHeaderFontStretch(UIElement element, FontStretch value)
}

public static readonly DependencyProperty HeaderFontWeightProperty =
DependencyProperty.RegisterAttached("HeaderFontWeight", typeof(FontWeight), typeof(ControlsHelper), new UIPropertyMetadata(FontWeights.Normal));
DependencyProperty.RegisterAttached("HeaderFontWeight", typeof(FontWeight), typeof(ControlsHelper), new FrameworkPropertyMetadata(SystemFonts.MessageFontWeight));

[Category(AppName.MahApps)]
[AttachedPropertyBrowsableForType(typeof(HeaderedContentControl))]
[AttachedPropertyBrowsableForType(typeof(TabControl))]
[AttachedPropertyBrowsableForType(typeof(Flyout))]
public static FontWeight GetHeaderFontWeight(UIElement element)
{
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Styles/Controls.Expander.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Styles/Controls.GroupBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
10 changes: 7 additions & 3 deletions src/MahApps.Metro/Styles/Controls.TabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<Style x:Key="MetroTabControl" TargetType="{x:Type TabControl}">
<Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
<Setter Property="BorderBrush" Value="{x:Null}" />
<!-- special property for header font size -->
<Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource TabItemFontSize}" />
<Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{DynamicResource GrayNormalBrush}" />
<Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{DynamicResource GrayHoverBrush}" />
<Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{DynamicResource HighlightBrush}" />
Expand Down Expand Up @@ -101,8 +103,10 @@
<Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=Background, Mode=OneWay, FallbackValue=Transparent}" />
<Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
<Setter Property="BorderThickness" Value="0" />
<!-- special property for header font size -->
<Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource TabItemFontSize}" />
<Setter Property="Controls:ControlsHelper.HeaderFontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontFamily), Mode=OneWay}" />
<Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontSize), Mode=OneWay}" />
<Setter Property="Controls:ControlsHelper.HeaderFontStretch" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontStretch), Mode=OneWay}" />
<Setter Property="Controls:ControlsHelper.HeaderFontWeight" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontWeight), Mode=OneWay}" />
<Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineBrush), Mode=OneWay}" />
<Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
<Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
Expand Down Expand Up @@ -144,7 +148,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
FontFamily="{TemplateBinding FontFamily}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontStyle="{TemplateBinding FontStyle}"
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Styles/VS/Expander.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
DockPanel.Dock="Top"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Styles/VS/GroupBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
5 changes: 1 addition & 4 deletions src/MahApps.Metro/Styles/VS/TabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@
BasedOn="{StaticResource MetroTabItem}"
TargetType="{x:Type TabItem}">
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
<!-- special property for header font size -->
<Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource TabItemFontSize}" />
<Setter Property="Controls:TabControlHelper.CloseButtonEnabled" Value="True" />
<Setter Property="Padding" Value="12 5 12 5" />
<Setter Property="Template">
Expand All @@ -167,8 +165,7 @@
ContentStringFormat="{TemplateBinding HeaderStringFormat}"
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
DockPanel.Dock="Top"
FontFamily="{TemplateBinding FontFamily}"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontStyle="{TemplateBinding FontStyle}"
Expand Down
1 change: 1 addition & 0 deletions src/MahApps.Metro/Themes/Flyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
ContentTemplate="{TemplateBinding HeaderTemplate}"
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
DockPanel.Dock="Top"
FontFamily="{TemplateBinding Controls:ControlsHelper.HeaderFontFamily}"
FontSize="{TemplateBinding Controls:ControlsHelper.HeaderFontSize}"
FontStretch="{TemplateBinding Controls:ControlsHelper.HeaderFontStretch}"
FontWeight="{TemplateBinding Controls:ControlsHelper.HeaderFontWeight}"
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Themes/HamburgerMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuItemStyle}" />
<Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
<Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
<Setter Property="PaneMargin" Value="0 0 0 8" />
<Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
<Setter Property="PaneMargin" Value="0 0 0 8" />
<Setter Property="Template" Value="{DynamicResource HamburgerMenuTemplate}" />
<Setter Property="VerticalContentAlignment" Value="Stretch" />
</Style>
Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,10 @@
<Button x:Name="HamburgerButton"
Width="{TemplateBinding HamburgerWidth}"
Height="{TemplateBinding HamburgerHeight}"
DockPanel.Dock="Left"
Padding="{TemplateBinding HamburgerMargin}"
AutomationProperties.Name="Main button"
ContentTemplate="{TemplateBinding HamburgerButtonTemplate}"
DockPanel.Dock="Left"
Foreground="{TemplateBinding PaneForeground}"
IsTabStop="{TemplateBinding IsTabStop}"
Style="{TemplateBinding HamburgerButtonStyle}"
Expand Down
Loading