Skip to content

Commit

Permalink
Make TabItems as content property of TabView (#1845)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ranjeshj
ranjeshj authored Jan 15, 2020
1 parent e8b2bce commit da8e31a
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 60 deletions.
1 change: 1 addition & 0 deletions dev/TabView/TabView.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ runtimeclass TabViewTabDragCompletedEventArgs

[WUXC_VERSION_MUXONLY]
[webhosthidden]
[contentproperty("TabItems")]
unsealed runtimeclass TabView : Windows.UI.Xaml.Controls.Control
{
TabView();
Expand Down
117 changes: 57 additions & 60 deletions dev/TabView/TestUI/TabViewPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,66 +111,63 @@
</Grid>
</controls:TabView.TabStripFooter>

<controls:TabView.TabItems>

<controls:TabViewItem x:Name="FirstTab" AutomationProperties.Name="FirstTab" Header="Home" CloseRequested="FirstTab_CloseRequested" ToolTipService.ToolTip="Custom Tooltip">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Home"/>
</controls:TabViewItem.IconSource>

<StackPanel x:Name="FirstTabContent" AutomationProperties.Name="FirstTabContent">
<Button x:Name="FirstTabButton" AutomationProperties.Name="FirstTabButton" Margin="8" FontSize="20">Home Button</Button>
<Button x:Name="TabViewSizingPageButton" AutomationProperties.Name="TabViewSizingPageButton" Margin="8" Click="TabViewSizingPageButton_Click" FontSize="20">TabView Sizing Page</Button>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="SecondTab" Header="SecondTab" IsClosable="True">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Shop"/>
</controls:TabViewItem.IconSource>

<StackPanel Padding="16">
<TextBlock>Shop text</TextBlock>
<Button Content="SecondTabButton" AutomationProperties.Name="SecondTabButton"/>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="LongHeaderTab" AutomationProperties.Name="LongHeaderTab" Header="Long Header No Icon">
<StackPanel Padding="16">
<TextBlock >Emoji text</TextBlock>
<Button Content="Button 3"/>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="NotCloseableTab" AutomationProperties.Name="NotCloseableTab" Header="Video" IsClosable="False">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Video"/>
</controls:TabViewItem.IconSource>

<StackPanel>
<TextBlock Padding="16">This tab can't be closed.</TextBlock>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="DisabledTab" AutomationProperties.Name="DisabledTab" Header="Disabled" IsEnabled="False">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Admin"/>
</controls:TabViewItem.IconSource>

<StackPanel>
<TextBlock Padding="16">This tab can't be selected.</TextBlock>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="LastTab" AutomationProperties.Name="LastTab" Header="Contact">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Contact"/>
</controls:TabViewItem.IconSource>

<TextBlock x:Name="LastTabContent" AutomationProperties.Name="LastTabContent" Padding="16">Contact text</TextBlock>
</controls:TabViewItem>

</controls:TabView.TabItems>
<controls:TabViewItem x:Name="FirstTab" AutomationProperties.Name="FirstTab" Header="Home" CloseRequested="FirstTab_CloseRequested" ToolTipService.ToolTip="Custom Tooltip">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Home"/>
</controls:TabViewItem.IconSource>

<StackPanel x:Name="FirstTabContent" AutomationProperties.Name="FirstTabContent">
<Button x:Name="FirstTabButton" AutomationProperties.Name="FirstTabButton" Margin="8" FontSize="20">Home Button</Button>
<Button x:Name="TabViewSizingPageButton" AutomationProperties.Name="TabViewSizingPageButton" Margin="8" Click="TabViewSizingPageButton_Click" FontSize="20">TabView Sizing Page</Button>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="SecondTab" Header="SecondTab" IsClosable="True">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Shop"/>
</controls:TabViewItem.IconSource>

<StackPanel Padding="16">
<TextBlock>Shop text</TextBlock>
<Button Content="SecondTabButton" AutomationProperties.Name="SecondTabButton"/>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="LongHeaderTab" AutomationProperties.Name="LongHeaderTab" Header="Long Header No Icon">
<StackPanel Padding="16">
<TextBlock >Emoji text</TextBlock>
<Button Content="Button 3"/>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="NotCloseableTab" AutomationProperties.Name="NotCloseableTab" Header="Video" IsClosable="False">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Video"/>
</controls:TabViewItem.IconSource>

<StackPanel>
<TextBlock Padding="16">This tab can't be closed.</TextBlock>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="DisabledTab" AutomationProperties.Name="DisabledTab" Header="Disabled" IsEnabled="False">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Admin"/>
</controls:TabViewItem.IconSource>

<StackPanel>
<TextBlock Padding="16">This tab can't be selected.</TextBlock>
</StackPanel>
</controls:TabViewItem>

<controls:TabViewItem x:Name="LastTab" AutomationProperties.Name="LastTab" Header="Contact">
<controls:TabViewItem.IconSource>
<controls:SymbolIconSource Symbol="Contact"/>
</controls:TabViewItem.IconSource>

<TextBlock x:Name="LastTabContent" AutomationProperties.Name="LastTabContent" Padding="16">Contact text</TextBlock>
</controls:TabViewItem>

</controls:TabView>

<Grid Grid.Row="1">
Expand Down

0 comments on commit da8e31a

Please sign in to comment.