Skip to content

Commit bf9062d

Browse files
lukeblevinslukeblevins
committed
Tweaks to Ribbon
1 parent 1c25322 commit bf9062d

File tree

1 file changed

+23
-18
lines changed

1 file changed

+23
-18
lines changed

‎Files UWP/ProHome.xaml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
1919
Loaded="Page_Loaded"
2020
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
21-
xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)">
21+
xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
22+
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
23+
xmlns:animations1="using:Microsoft.Toolkit.Uwp.UI.Animations.Behaviors">
2224
<Page.Resources>
2325
<Style x:Key="ListViewHeaderItemStyle1" TargetType="ListViewHeaderItem">
2426
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
@@ -49,10 +51,10 @@
4951
<StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="SystemControlForegroundBaseHighBrush"/>
5052
<StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="SystemControlForegroundBaseMediumHighBrush"/>
5153
<StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush"/>
52-
<Thickness x:Key="TabViewItemHeaderIconMargin">0,0,8,0</Thickness>
53-
<Thickness x:Key="TabViewItemHeaderCloseMargin">8,0,-8,0</Thickness>
54-
<x:Double x:Key="TabViewItemHeaderIconSize">16</x:Double>
55-
<x:Double x:Key="TabViewItemHeaderCloseWidth">32</x:Double>
54+
<Thickness x:Key="TabViewItemHeaderIconMargin">0,0,0,0</Thickness>
55+
<Thickness x:Key="TabViewItemHeaderCloseMargin">0,0,0,0</Thickness>
56+
<x:Double x:Key="TabViewItemHeaderIconSize">0</x:Double>
57+
<x:Double x:Key="TabViewItemHeaderCloseWidth">0</x:Double>
5658
<converters:EmptyObjectToObjectConverter x:Key="NullVisibilityConverter" EmptyValue="Collapsed" NotEmptyValue="Visible"/>
5759
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
5860
<converters:BoolToObjectConverter x:Key="CloseCollapsingSizeConverter" FalseValue="{StaticResource TabViewItemHeaderCloseWidth}" TrueValue="NaN"/>
@@ -119,8 +121,9 @@
119121
</Setter.Value>
120122
</Setter>
121123
</Style>
124+
<x:Double x:Key="TabViewItemHeaderMinHeight">32</x:Double>
122125
<ControlTemplate x:Key="TabViewItemFluentTemplate" TargetType="Custom:TabViewItem">
123-
<Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}" Control.IsTemplateFocusTarget="True" RenderTransformOrigin="0.5,0.5">
126+
<Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}" Control.IsTemplateFocusTarget="True" RenderTransformOrigin="0.5,0.5">
124127
<Grid.RenderTransform>
125128
<ScaleTransform x:Name="LayoutRootScale"/>
126129
</Grid.RenderTransform>
@@ -145,12 +148,11 @@
145148
<VisualState.Setters>
146149
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TabViewItemHeaderForegroundPointerOver}"/>
147150
<Setter Target="TabContent.HorizontalAlignment" Value="Stretch"/>
148-
<Setter Target="SelectionIndicator.Margin" Value="-4,-1"/>
151+
<Setter Target="SelectionIndicator.Margin" Value="-7,-1,-7,-1"/>
149152

150153
</VisualState.Setters>
151154
<Storyboard>
152155
<DoubleAnimation Duration="0" Storyboard.TargetName="SelectionIndicator" Storyboard.TargetProperty="Opacity" To="1"/>
153-
154156
</Storyboard>
155157
</VisualState>
156158
<VisualState x:Name="PressedSelected">
@@ -241,14 +243,14 @@
241243
</VisualState>
242244
</VisualStateGroup>
243245
</VisualStateManager.VisualStateGroups>
244-
<Grid Height="Auto" Padding="0">
246+
<Grid Height="Auto">
245247
<Grid x:Name="ContentPresenterGrid">
246248
<Grid.RenderTransform>
247249
<TranslateTransform x:Name="ContentPresenterTranslateTransform"/>
248250
</Grid.RenderTransform>
249-
<StackPanel Width="Auto" Name="TabContent" Spacing="5" Margin="8" Padding="2" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical">
251+
<StackPanel Padding="8,0" Width="Auto" Name="TabContent" Spacing="3" VerticalAlignment="Center" HorizontalAlignment="Stretch" Orientation="Vertical">
250252
<ContentPresenter x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentTransitions="{TemplateBinding ContentTransitions}" FontWeight="{TemplateBinding FontWeight}" HorizontalAlignment="Center" OpticalMarginAlignment="None" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
251-
<Rectangle RadiusX="1" RadiusY="1" x:Name="SelectionIndicator" Fill="{ThemeResource SystemAccentColor}" Height="3" Margin="0,-1" Opacity="0" HorizontalAlignment="Stretch" />
253+
<Rectangle RadiusX="1" RadiusY="1" x:Name="SelectionIndicator" Fill="{ThemeResource SystemAccentColor}" Height="3" Margin="0,-1,0,-1" Opacity="0" HorizontalAlignment="Stretch" />
252254
</StackPanel>
253255

254256
</Grid>
@@ -516,6 +518,9 @@
516518
</Setter.Value>
517519
</Setter>
518520
</Style>
521+
<ItemsPanelTemplate x:Key="TabViewItemsPanel1">
522+
<StackPanel Padding="0,0,0,0" Orientation="Horizontal" Spacing="0"/>
523+
</ItemsPanelTemplate>
519524
</Page.Resources>
520525

521526
<Grid Padding="0,0,0,0">
@@ -623,10 +628,10 @@
623628
<RowDefinition Height="*"/>
624629
</Grid.RowDefinitions>
625630

626-
<Grid Margin="0,-1,0,0" Canvas.ZIndex="2" x:Name="Ribbon" Grid.Row="0">
631+
<Grid Margin="0,0,0,0" Canvas.ZIndex="2" x:Name="Ribbon" Grid.Row="0">
627632
<StackPanel Name="RibbonPanel" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Orientation="Vertical">
628-
<Custom:TabView TabWidthBehavior="Actual" Background="Transparent" Template="{StaticResource TabViewTemplate1}">
629-
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="File">
633+
<Custom:TabView ItemsPanel="{StaticResource TabViewItemsPanel1}" TabWidthBehavior="Actual" Background="Transparent" Template="{StaticResource TabViewTemplate1}">
634+
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="File" MinWidth="48" MinHeight="32" Width="Auto">
630635
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
631636
<CommandBar.Content>
632637
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
@@ -636,7 +641,7 @@
636641
</CommandBar.Content>
637642
</CommandBar>
638643
</Custom:TabViewItem>
639-
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" IsSelected="True" BorderThickness="0" Header="Home">
644+
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" IsSelected="True" BorderThickness="0" Header="Home" MinWidth="48" MinHeight="32" Width="Auto">
640645
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
641646
<CommandBar.Content>
642647
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
@@ -667,7 +672,7 @@
667672
</CommandBar.Content>
668673
</CommandBar>
669674
</Custom:TabViewItem>
670-
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Share">
675+
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Share" MinWidth="48" MinHeight="32" Width="Auto">
671676
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
672677
<CommandBar.Content>
673678
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
@@ -676,7 +681,7 @@
676681
</CommandBar.Content>
677682
</CommandBar>
678683
</Custom:TabViewItem>
679-
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Layout">
684+
<Custom:TabViewItem Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Layout" MinWidth="48" MinHeight="32" Width="Auto">
680685
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
681686
<CommandBar.Content>
682687
<CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
@@ -709,7 +714,7 @@
709714
</CommandBar.Content>
710715
</CommandBar>
711716
</Custom:TabViewItem>
712-
<Custom:TabViewItem Visibility="Collapsed" Name="SearchTools" Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Search">
717+
<Custom:TabViewItem Visibility="Collapsed" Name="SearchTools" Template="{StaticResource TabViewItemFluentTemplate}" BorderThickness="0" Header="Search" MinWidth="48" MinHeight="32" Width="Auto">
713718
<Custom:TabViewItem.Background>
714719
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
715720
<GradientStop Color="#FFD9D7D2" Offset="0"/>

0 commit comments

Comments
 (0)