Skip to content

Commit 5ca41fa

Browse files
AwsmolakKeboo
Awsmolak
and
Keboo
authored
Renamed MaterialDesignNavigatilRailTabControl to MaterialDesignNaviga… (#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 <[email protected]>
1 parent 0c87790 commit 5ca41fa

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

‎MainDemo.Wpf/NavigationRail.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<TabControl
3636
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
3737
SnapsToDevicePixels="True"
38-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
38+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
3939
TabStripPlacement="Left">
4040
<materialDesign:NavigationRailAssist.FloatingContent>
4141
<Button
@@ -168,7 +168,7 @@
168168
materialDesign:ColorZoneAssist.Mode="PrimaryLight"
169169
materialDesign:NavigationRailAssist.SelectionCornerRadius="50"
170170
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
171-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
171+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
172172
TabStripPlacement="Bottom">
173173

174174
<TabItem Margin="4">
@@ -241,7 +241,7 @@
241241
Margin="0,8,8,0"
242242
UniqueKey="navrail_2">
243243
<materialDesign:Card>
244-
<TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" TabStripPlacement="Right">
244+
<TabControl Style="{StaticResource MaterialDesignNavigationRailTabControl}" TabStripPlacement="Right">
245245
<TabItem>
246246
<TabItem.Header>
247247
<StackPanel Width="auto" Height="auto">
@@ -331,7 +331,7 @@
331331
<TabControl
332332
VerticalContentAlignment="Bottom"
333333
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
334-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
334+
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
335335
<TabItem>
336336
<TabItem.Header>
337337
<StackPanel Width="auto" Height="auto">
@@ -427,7 +427,7 @@
427427
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
428428
materialDesign:NavigationRailAssist.SelectionCornerRadius="50 10 10 10"
429429
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
430-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
430+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
431431
TabStripPlacement="Top">
432432
<materialDesign:NavigationRailAssist.FloatingContent>
433433
<Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
@@ -532,7 +532,7 @@
532532
<TabControl
533533
materialDesign:ColorZoneAssist.Mode="Standard"
534534
materialDesign:ShadowAssist.ShadowDepth="Depth0"
535-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
535+
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
536536
<TabItem>
537537
<TabItem.Header>
538538
<StackPanel Width="auto" Height="auto">
@@ -594,7 +594,7 @@
594594
<TabControl
595595
materialDesign:ColorZoneAssist.Mode="Standard"
596596
materialDesign:ShadowAssist.ShadowDepth="Depth1"
597-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
597+
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
598598
<TabItem>
599599
<TabItem.Header>
600600
<StackPanel Width="auto" Height="auto">
@@ -656,7 +656,7 @@
656656
<TabControl
657657
materialDesign:ColorZoneAssist.Mode="Standard"
658658
materialDesign:ShadowAssist.ShadowDepth="Depth2"
659-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
659+
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
660660
<TabItem>
661661
<TabItem.Header>
662662
<StackPanel Width="auto" Height="auto">
@@ -718,7 +718,7 @@
718718
<TabControl
719719
materialDesign:ColorZoneAssist.Mode="Standard"
720720
materialDesign:ShadowAssist.ShadowDepth="Depth3"
721-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
721+
Style="{StaticResource MaterialDesignNavigationRailTabControl}">
722722
<TabItem>
723723
<TabItem.Header>
724724
<StackPanel Width="auto" Height="auto">

‎MaterialDesign3.Demo.Wpf/NavigationRail.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<smtx:XamlDisplay
5050
UniqueKey="navrail_1"
5151
Margin="5,5,5,0">
52-
<TabControl Style="{StaticResource MaterialDesignNavigatilRailTabControl}" BorderThickness="0"
52+
<TabControl Style="{StaticResource MaterialDesignNavigationRailTabControl}" BorderThickness="0"
5353
BorderBrush="Transparent" TabStripPlacement="Left"
5454
materialDesign:ShadowAssist.ShadowDepth="Depth0"
5555
materialDesign:ColorZoneAssist.Mode="Standard" SnapsToDevicePixels="True"
@@ -126,7 +126,7 @@
126126
Margin="5,5,5,0"
127127
Grid.Column="1">
128128
<TabControl TabStripPlacement="Bottom"
129-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
129+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
130130
materialDesign:ColorZoneAssist.Mode="PrimaryLight"
131131
materialDesign:NavigationRailAssist.ShowSelectionBackground="True"
132132
materialDesign:NavigationRailAssist.SelectionCornerRadius="50"
@@ -190,7 +190,7 @@
190190
Margin="5,5,5,0"
191191
Grid.Row="1">
192192
<TabControl
193-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
193+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
194194
TabStripPlacement="Right">
195195
<TabItem >
196196
<TabItem.Header>
@@ -264,7 +264,7 @@
264264
Grid.Row="1"
265265
Grid.Column="1">
266266
<TabControl VerticalContentAlignment="Bottom"
267-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
267+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
268268
materialDesign:ColorZoneAssist.Mode="PrimaryMid">
269269
<TabItem >
270270
<TabItem.Header>
@@ -339,7 +339,7 @@
339339
Margin="5">
340340
<smtx:XamlDisplay UniqueKey="navrail_floating_1">
341341
<TabControl
342-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
342+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
343343
materialDesign:ColorZoneAssist.Mode="PrimaryMid"
344344
TabStripPlacement="Top"
345345
materialDesign:NavigationRailAssist.SelectionCornerRadius="50 10 10 10"
@@ -428,7 +428,7 @@
428428
<StackPanel Orientation="Horizontal">
429429
<smtx:XamlDisplay UniqueKey="navrail_noshadow_1">
430430
<TabControl
431-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
431+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
432432
materialDesign:ColorZoneAssist.Mode="Standard"
433433
materialDesign:ShadowAssist.ShadowDepth="Depth0">
434434
<TabItem >
@@ -472,7 +472,7 @@
472472

473473
<smtx:XamlDisplay UniqueKey="navrail_wshadow_1">
474474
<TabControl
475-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
475+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
476476
materialDesign:ColorZoneAssist.Mode="Standard"
477477
materialDesign:ShadowAssist.ShadowDepth="Depth1">
478478
<TabItem >
@@ -516,7 +516,7 @@
516516

517517
<smtx:XamlDisplay UniqueKey="navrail_wshadow_2">
518518
<TabControl
519-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
519+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
520520
materialDesign:ColorZoneAssist.Mode="Standard"
521521
materialDesign:ShadowAssist.ShadowDepth="Depth2">
522522
<TabItem >
@@ -560,7 +560,7 @@
560560

561561
<smtx:XamlDisplay UniqueKey="navrail_wshadow_3">
562562
<TabControl
563-
Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
563+
Style="{StaticResource MaterialDesignNavigationRailTabControl}"
564564
materialDesign:ColorZoneAssist.Mode="Standard"
565565
materialDesign:ShadowAssist.ShadowDepth="Depth3">
566566
<TabItem >

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TabControl.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@
430430
</Setter>
431431
</Style>
432432

433-
<Style x:Key="MaterialDesignNavigatilRailTabControl" TargetType="{x:Type TabControl}">
433+
<Style x:Key="MaterialDesignNavigationRailTabControl" TargetType="{x:Type TabControl}">
434434
<Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
435435
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
436436
<Setter Property="VerticalContentAlignment" Value="Top" />
@@ -578,4 +578,8 @@
578578
</Setter.Value>
579579
</Setter>
580580
</Style>
581+
582+
<!-- Obsolete: will be removed in 5.0.0 release -->
583+
<Style x:Key="MaterialDesignNavigatilRailTabControl" TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignNavigationRailTabControl}" />
584+
581585
</ResourceDictionary>

0 commit comments

Comments
 (0)