Skip to content

Commit

Permalink
Renamed MaterialDesignNavigatilRailTabControl to MaterialDesignNaviga… (
Browse files Browse the repository at this point in the history
#2585)

* Renamed MaterialDesignNavigatilRailTabControl to MaterialDesignNavigationRailTabControl

* Allowing for backwards compat until 5.0.0

Added to the list on #2255

* Fixing my typo

Co-authored-by: Kevin Bost <kitokeboo@gmail.com>
  • Loading branch information
Awsmolak and Keboo authored Feb 24, 2022
1 parent 0c87790 commit 5ca41fa
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
18 changes: 9 additions & 9 deletions MainDemo.Wpf/NavigationRail.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<TabControl
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
SnapsToDevicePixels="True"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
TabStripPlacement="Left">
<materialDesign:NavigationRailAssist.FloatingContent>
<Button
Expand Down Expand Up @@ -168,7 +168,7 @@
materialDesign:ColorZoneAssist.Mode="PrimaryLight"
materialDesign:NavigationRailAssist.SelectionCornerRadius="50"
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
TabStripPlacement="Bottom">

<TabItem Margin="4">
Expand Down Expand Up @@ -241,7 +241,7 @@
Margin="0,8,8,0"
UniqueKey="navrail_2">
<materialDesign:Card>
<TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" TabStripPlacement="Right">
<TabControl Style="{StaticResource MaterialDesignNavigationRailTabControl}" TabStripPlacement="Right">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down Expand Up @@ -331,7 +331,7 @@
<TabControl
VerticalContentAlignment="Bottom"
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down Expand Up @@ -427,7 +427,7 @@
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
materialDesign:NavigationRailAssist.SelectionCornerRadius="50 10 10 10"
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
TabStripPlacement="Top">
<materialDesign:NavigationRailAssist.FloatingContent>
<Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
Expand Down Expand Up @@ -532,7 +532,7 @@
<TabControl
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth0"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down Expand Up @@ -594,7 +594,7 @@
<TabControl
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth1"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down Expand Up @@ -656,7 +656,7 @@
<TabControl
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth2"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down Expand Up @@ -718,7 +718,7 @@
<TabControl
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth3"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
<TabItem>
<TabItem.Header>
<StackPanel Width="auto" Height="auto">
Expand Down
18 changes: 9 additions & 9 deletions MaterialDesign3.Demo.Wpf/NavigationRail.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<smtx:XamlDisplay
UniqueKey="navrail_1"
Margin="5,5,5,0">
<TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" BorderThickness="0"
<TabControl Style="{StaticResource MaterialDesignNavigationRailTabControl}" BorderThickness="0"
BorderBrush="Transparent" TabStripPlacement="Left"
materialDesign:ShadowAssist.ShadowDepth="Depth0"
materialDesign:ColorZoneAssist.Mode="Standard" SnapsToDevicePixels="True"
Expand Down Expand Up @@ -126,7 +126,7 @@
Margin="5,5,5,0"
Grid.Column="1">
<TabControl TabStripPlacement="Bottom"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="PrimaryLight"
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
materialDesign:NavigationRailAssist.SelectionCornerRadius="50"
Expand Down Expand Up @@ -190,7 +190,7 @@
Margin="5,5,5,0"
Grid.Row="1">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
TabStripPlacement="Right">
<TabItem >
<TabItem.Header>
Expand Down Expand Up @@ -264,7 +264,7 @@
Grid.Row="1"
Grid.Column="1">
<TabControl VerticalContentAlignment="Bottom"
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="PrimaryMid">
<TabItem >
<TabItem.Header>
Expand Down Expand Up @@ -339,7 +339,7 @@
Margin="5">
<smtx:XamlDisplay UniqueKey="navrail_floating_1">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
TabStripPlacement="Top"
materialDesign:NavigationRailAssist.SelectionCornerRadius="50 10 10 10"
Expand Down Expand Up @@ -428,7 +428,7 @@
<StackPanel Orientation="Horizontal">
<smtx:XamlDisplay UniqueKey="navrail_noshadow_1">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth0">
<TabItem >
Expand Down Expand Up @@ -472,7 +472,7 @@

<smtx:XamlDisplay UniqueKey="navrail_wshadow_1">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth1">
<TabItem >
Expand Down Expand Up @@ -516,7 +516,7 @@

<smtx:XamlDisplay UniqueKey="navrail_wshadow_2">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth2">
<TabItem >
Expand Down Expand Up @@ -560,7 +560,7 @@

<smtx:XamlDisplay UniqueKey="navrail_wshadow_3">
<TabControl
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
materialDesign:ColorZoneAssist.Mode="Standard"
materialDesign:ShadowAssist.ShadowDepth="Depth3">
<TabItem >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@
</Setter>
</Style>

<Style x:Key="MaterialDesignNavigatilRailTabControl" TargetType="{x:Type TabControl}">
<Style x:Key="MaterialDesignNavigationRailTabControl" TargetType="{x:Type TabControl}">
<Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="VerticalContentAlignment" Value="Top" />
Expand Down Expand Up @@ -578,4 +578,8 @@
</Setter.Value>
</Setter>
</Style>

<!-- Obsolete: will be removed in 5.0.0 release -->
<Style x:Key="MaterialDesignNavigatilRailTabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignNavigationRailTabControl}" />

</ResourceDictionary>

0 comments on commit 5ca41fa

Please sign in to comment.