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

Show file tree
Hide file tree
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
TabItem Foreground bug fix
  • Loading branch information
@MichelMichels
MichelMichels committed Dec 26, 2021
commit 5291460a3856b7175e592916358fdbc1f25ac3e2
122 changes: 24 additions & 98 deletions MainDemo.Wpf/Tabs.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,17 @@
<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_1">
<materialDesign:Card>
<TabControl Width="300" Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TabControl Width="300">
<TabItem Header="TAB 1">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Margin="8"
Text="Standard Tab 1" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TabItem Header="TAB 2">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Margin="8"
Text="Standard Tab 2" />
</TabItem>
</TabControl>
Expand All @@ -52,20 +48,14 @@
TabStripPlacement="Left">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Standard Left Tab 1" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TabItem Header="TAB 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Standard Left Tab 2" />
</TabItem>
</TabControl>
Expand All @@ -78,23 +68,17 @@
Width="300"
materialDesign:ColorZoneAssist.Mode="Inverted"
Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TabItem Header="TAB 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Standard Tab 1 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TabItem Header="TAB 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Standard Tab 2 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
Expand All @@ -104,38 +88,6 @@
</smtx:XamlDisplay>
</WrapPanel>

<TextBlock
Margin="0,0,0,8"
Style="{StaticResource MaterialDesignHeadline5TextBlock}"
Text="Compact style" />

<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay VerticalContentAlignment="Top" UniqueKey="tabs_2">
<materialDesign:Card>
<TabControl Width="300" Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItemCompact}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Compact Tab 1" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItemCompact}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Compact Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>

<TextBlock
Margin="0,0,0,8"
Style="{StaticResource MaterialDesignHeadline5TextBlock}"
Expand All @@ -148,23 +100,17 @@
Width="300"
materialDesign:ColorZoneAssist.Mode="PrimaryDark"
Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItemCompact}">
<TabItem Header="TAB 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Tab 1 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItemCompact}">
<TabItem Header="TAB 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Tab 2 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
Expand All @@ -178,23 +124,17 @@
Width="300"
materialDesign:ColorZoneAssist.Mode="SecondaryMid"
Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItemCompact}">
<TabItem Header="TAB 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Tab 1 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItemCompact}">
<TabItem Header="TAB 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Tab 2 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
Expand All @@ -209,37 +149,23 @@
materialDesign:ColorZoneAssist.Mode="Inverted"
Style="{StaticResource MaterialDesignTabControl}"
TabStripPlacement="Right">
<TabItem
Header="Tab 1"
Style="{StaticResource MaterialDesignTabItemCompact}"
Typography.Capitals="Normal">
<TabItem Header="TAB 1" Typography.Capitals="Normal">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Right Tab 1 with Inverted ColorZone Mode and Normal Header Typography"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem
Header="Tab 2"
Style="{StaticResource MaterialDesignTabItemCompact}"
Typography.Capitals="Normal">
<TabItem Header="TAB 2" Typography.Capitals="Normal">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Margin="8"
Text="Compact Right Tab 2 with Inverted ColorZone Mode and Normal Header Typography"
TextWrapping="WrapWithOverflow" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>


</StackPanel>
</UserControl>
4 changes: 2 additions & 2 deletions MaterialDesignThemes.Wpf/TabItemAssist.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public static class TabItemAssist
= DependencyProperty.RegisterAttached("TopIcon", typeof(PackIconKind?), typeof(TabItemAssist),
new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.Inherits));

public static object GetTopIcon(DependencyObject element)
=> element.GetValue(TopIconProperty);
public static PackIconKind? GetTopIcon(DependencyObject element)
=> (PackIconKind?)element.GetValue(TopIconProperty);
public static void SetTopIcon(DependencyObject element, object value)
=> element.SetValue(TopIconProperty, value);
#endregion
Expand Down
Loading