Skip to content

Commit 8762353

Browse files
committed
Updated to follow new sample page guidelines
1 parent 3427f41 commit 8762353

File tree

6 files changed

+4
-60
lines changed

6 files changed

+4
-60
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,6 @@
498498
<Compile Include="SamplePages\FocusBehavior\FocusBehaviorPage.xaml.cs">
499499
<DependentUpon>FocusBehaviorPage.xaml</DependentUpon>
500500
</Compile>
501-
<Compile Include="SamplePages\TabbedCommandBar\TabbedCommandBarPage.xaml.cs">
502-
<DependentUpon>TabbedCommandBarPage.xaml</DependentUpon>
503-
</Compile>
504501
<Compile Include="SamplePages\TilesBrush\TilesBrushPage.xaml.cs">
505502
<DependentUpon>TilesBrushPage.xaml</DependentUpon>
506503
</Compile>
@@ -982,10 +979,6 @@
982979
<Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.bind">
983980
<SubType>Designer</SubType>
984981
</Content>
985-
<Page Include="SamplePages\TabbedCommandBar\TabbedCommandBarPage.xaml">
986-
<SubType>Designer</SubType>
987-
<Generator>MSBuild:Compile</Generator>
988-
</Page>
989982
<Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
990983
<Generator>MSBuild:Compile</Generator>
991984
<SubType>Designer</SubType>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabbedCommandBar/TabbedCommandBarPage.xaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabbedCommandBar/TabbedCommandBarPage.xaml.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,10 @@
456456
},
457457
{
458458
"Name": "TabbedCommandBar",
459-
"Type": "TabbedCommandBarPage",
460459
"Subcategory": "Layout",
461460
"About": "A control for displaying multiple CommandBars in the same space, like Microsoft Office's ribbon.",
462461
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar",
463-
"XamlCodeFile": "TabbedCommandBar.bind",
462+
"XamlCodeFile": "/SamplePages/TabbedCommandBar/TabbedCommandBar.bind",
464463
"Icon": "/SamplePages/TabbedCommandBar/TabbedCommandBar.png",
465464
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/TabbedCommandBar.md"
466465
}

Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBar.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ private void SelectedItemVisibilityChanged(DependencyObject sender, DependencyPr
9393
// If the item is not visible, default to the first tab
9494
if (sender.GetValue(dp) is Visibility vis && vis == Visibility.Collapsed)
9595
{
96+
// FIXME: This will cause WinUI to throw an exception if run
97+
// when the tabs overflow
9698
SelectedItem = MenuItems.FirstOrDefault();
9799
}
98100
}

Microsoft.Toolkit.Uwp.UI.Controls/TabbedCommandBar/TabbedCommandBarItem.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
44

5-
<SolidColorBrush x:Key="ContextualTabBackground" Color="{StaticResource SystemAltMediumColor}"/>
5+
<SolidColorBrush x:Key="ContextualTabBackground" Color="{ThemeResource SystemAltMediumColor}"/>
66

77
<Style BasedOn="{StaticResource DefaultTabbedCommandBarItemStyle}" TargetType="controls:TabbedCommandBarItem"/>
88

0 commit comments

Comments
 (0)