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

Jump to bottom

Tab control extended #2544

Merged
merged 14 commits into from
Dec 30, 2021
Merged

Tab control extended #2544

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
29c2c5e
Uncomment TabControl and TabItem default style and Tweak it a bit and…
ahmed-abdelrazek Dec 24, 2021
d60e209
Enable the new TabControl/TabItem Styles by default for Material 2/3
ahmed-abdelrazek Dec 24, 2021
514c8bb
Add a new Tabs UserControl to the Main Demo App to show the new styles
ahmed-abdelrazek Dec 24, 2021
3f96c0f
Tabs page in demo app rework, wip TopIcon for TabItem
MichelMichels Dec 26, 2021
5291460
TabItem Foreground bug fix
MichelMichels Dec 26, 2021
3c87ccc
Demo page edited
MichelMichels Dec 26, 2021
ebf3051
Removed unnecessary properties
MichelMichels Dec 26, 2021
0820e76
Placement fix for TabControl header when left or right
MichelMichels Dec 26, 2021
b0b7657
Filled style implemented
MichelMichels Dec 28, 2021
de2a6b5
Update MainDemo.Wpf/Domain/MainWindowViewModel.cs
MichelMichels Dec 29, 2021
eb90157
Different sizes added to Demo app
MichelMichels Dec 29, 2021
044cfbe
Merge branch 'TabControl-extended' of https://github.com/MichelMichel…
MichelMichels Dec 29, 2021
06cbb03
Shadows fixed
MichelMichels Dec 29, 2021
2d4d15d
PART_ColorZone renamed to PART_HeaderCard
MichelMichels Dec 29, 2021
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
Prev Previous commit
Next Next commit
Demo page edited
  • Loading branch information
@MichelMichels
MichelMichels committed Dec 26, 2021
commit 3c87ccc1f91c150bbf4afb0e82c22b23e33ac76f
14 changes: 14 additions & 0 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<Setter Property="Padding" Value="0" />
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesignFlatButtonRipple}" />
<Setter Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid" />
<Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth3" />
<Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Bottom" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TabControl}">
Expand All @@ -42,6 +44,8 @@
x:Name="PART_ColorZone"
wpf:ColorZoneAssist.Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Background)}"
wpf:ColorZoneAssist.Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Foreground)}"
wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth)}"
wpf:ShadowAssist.ShadowEdges="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowEdges)}"
DockPanel.Dock="Top"
Focusable="False"
Mode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ColorZoneAssist.Mode)}">
Expand Down Expand Up @@ -79,14 +83,17 @@
<ControlTemplate.Triggers>
<Trigger Property="TabStripPlacement" Value="Bottom">
<Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Bottom" />
<Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Top" />
</Trigger>
<Trigger Property="TabStripPlacement" Value="Left">
<Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Left" />
<Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
<Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Right" />
<Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
</Trigger>
<Trigger Property="TabStripPlacement" Value="Right">
<Setter TargetName="PART_ColorZone" Property="DockPanel.Dock" Value="Right" />
<Setter Property="wpf:ShadowAssist.ShadowEdges" Value="Left" />
<Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
<Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
</Trigger>
Expand All @@ -96,6 +103,13 @@
</Setter>
</Style>

<Style
x:Key="MaterialDesignFilledTabControl"
BasedOn="{StaticResource MaterialDesignTabControlBase}"
TargetType="{x:Type TabControl}">
<Setter Property="wpf:ColorZoneAssist.Mode" Value="PrimaryMid" />
</Style>

<Style x:Key="MaterialDesignTabItem" TargetType="{x:Type TabItem}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
Expand Down