Skip to content

Tab control extended #2544

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
Keboo 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
Filled style implemented
  • Loading branch information
@MichelMichels
MichelMichels committed Dec 28, 2021
commit b0b765721552e932381652a210ec2156122cecb8
236 changes: 168 additions & 68 deletions MainDemo.Wpf/Tabs.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,132 +23,232 @@
<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_1">
<materialDesign:Card>
<TabControl Width="300">
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryLight">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Standard Tab 1" />
<TextBlock Margin="8" Text="PrimaryLight Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Standard Tab 2" />
<TextBlock Margin="8" Text="PrimaryLight Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_2">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryMid">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="PrimaryMid Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="PrimaryMid Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_3">
<materialDesign:Card>
<TabControl Width="300" TabStripPlacement="Left">
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryDark">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Standard Left Tab 1" />
<TextBlock Margin="8" Text="PrimaryDark Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Standard Left Tab 2" />
<TextBlock Margin="8" Text="PrimaryDark Tab 2" />
</TabItem>
</TabControl>

</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>

<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_4">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="Inverted">
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryLight">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Standard Tab 1 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="SecondaryLight Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Standard Tab 2 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="SecondaryLight Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_5">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryMid">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="SecondaryMid Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="SecondaryMid Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_6">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryDark">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="SecondaryDark Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="SecondaryDark Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>

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

<WrapPanel>
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_5">
<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_7">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="PrimaryDark">
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="PrimaryLight"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Compact Tab 1 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="PrimaryLight Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Compact Tab 2 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="PrimaryLight Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_6">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_8">
<materialDesign:Card>
<TabControl Width="300" materialDesign:ColorZoneAssist.Mode="SecondaryMid">
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Compact Tab 1 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="PrimaryMid Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Compact Tab 2 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="PrimaryMid Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_7">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_9">
<materialDesign:Card>
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="PrimaryDark"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="PrimaryDark Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="PrimaryDark Tab 2" />
</TabItem>
</TabControl>

</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>

<WrapPanel Margin="0,0,0,16">
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_10">
<materialDesign:Card>
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="Inverted"
TabStripPlacement="Right">
materialDesign:ColorZoneAssist.Mode="SecondaryLight"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="SecondaryLight Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="SecondaryLight Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_11">
<materialDesign:Card>
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="SecondaryMid"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="SecondaryMid Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="SecondaryMid Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_12">
<materialDesign:Card>
<TabControl
Width="300"
materialDesign:ColorZoneAssist.Mode="SecondaryDark"
Style="{StaticResource MaterialDesignFilledTabControl}">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="SecondaryDark Tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="SecondaryDark Tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>
</WrapPanel>

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

<WrapPanel>
<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_13">
<materialDesign:Card>
<TabControl Width="300" TabStripPlacement="Left">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="Left placement" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="Left placement" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_14">
<materialDesign:Card>
<TabControl Width="300" TabStripPlacement="Right">
<TabItem Header="TAB 1">
<TextBlock Margin="8" Text="Right placement tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock Margin="8" Text="Right placement tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
</smtx:XamlDisplay>

<smtx:XamlDisplay Margin="0,0,16,16" UniqueKey="tabs_15">
<materialDesign:Card>
<TabControl Width="300" TabStripPlacement="Bottom">
<TabItem Header="TAB 1">
<TextBlock
Height="200"
Margin="8"
Text="Compact Right Tab 1 with Inverted ColorZone Mode and Normal Header Typography"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="Bottom placement tab 1" />
</TabItem>
<TabItem Header="TAB 2">
<TextBlock
Height="200"
Margin="8"
Text="Compact Right Tab 2 with Inverted ColorZone Mode and Normal Header Typography"
TextWrapping="WrapWithOverflow" />
<TextBlock Margin="8" Text="Bottom placement tab 2" />
</TabItem>
</TabControl>
</materialDesign:Card>
Expand Down
Loading