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
Add a new Tabs UserControl to the Main Demo App to show the new styles
  • Loading branch information
@ahmed-abdelrazek
ahmed-abdelrazek committed Dec 24, 2021
commit 514c8bb0fdbf995baaaf3eb7d3f76dc5f35d090d
8 changes: 8 additions & 0 deletions MainDemo.Wpf/Domain/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,14 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
DocumentationLink.StyleLink("ListView")
});

yield return new DemoItem(
"Tabs",
typeof(Tabs),
new[]
{
DocumentationLink.DemoPageLink<Tabs>()
MichelMichels marked this conversation as resolved.
Show resolved Hide resolved
});

yield return new DemoItem(
"Trees",
typeof(Trees),
Expand Down
212 changes: 212 additions & 0 deletions MainDemo.Wpf/Tabs.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,212 @@
<UserControl
x:Class="MaterialDesignDemo.Tabs"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<WrapPanel Margin="0,0,8,8">
<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_1">
<TabControl Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Tab 1" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Tab 2" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_2">
<TabControl 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>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_3">
<TabControl Style="{StaticResource MaterialDesignTabControl}" TabStripPlacement="Left">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Left Tab 1" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Left Tab 2" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_4">
<TabControl materialDesign:ColorZoneAssist.Mode="Inverted" Style="{StaticResource MaterialDesignTabControl}">
<TabItem Header="Tab 1" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Tab 1 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItem}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Standard Tab 2 with Inverted ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_5">
<TabControl materialDesign:ColorZoneAssist.Mode="PrimaryDark" 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 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItemCompact}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Compact Tab 2 with PrimaryDark ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_6">
<TabControl materialDesign:ColorZoneAssist.Mode="SecondaryMid" 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 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
<TabItem Header="Tab 2" Style="{StaticResource MaterialDesignTabItemCompact}">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Compact Tab 2 with SecondaryMid ColorZone Mode"
TextWrapping="WrapWithOverflow" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>

<smtx:XamlDisplay
Margin="16,4,0,16"
VerticalContentAlignment="Top"
UniqueKey="tabs_7">
<TabControl
materialDesign:ColorZoneAssist.Mode="Inverted"
Style="{StaticResource MaterialDesignTabControl}"
TabStripPlacement="Right">
<TabItem
Header="Tab 1"
Style="{StaticResource MaterialDesignTabItemCompact}"
Typography.Capitals="Normal">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
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">
<TextBlock
Width="200"
Height="200"
Margin="5"
VerticalAlignment="Top"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Text="Compact Right Tab 2 with Inverted ColorZone Mode and Normal Header Typography"
TextWrapping="WrapWithOverflow" />
</TabItem>
</TabControl>
</smtx:XamlDisplay>
</WrapPanel>
</UserControl>
28 changes: 28 additions & 0 deletions MainDemo.Wpf/Tabs.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;

namespace MaterialDesignDemo
{
/// <summary>
/// Interaction logic for Tabs.xaml
/// </summary>
public partial class Tabs : UserControl
{
public Tabs()
{
InitializeComponent();
}
}
}