Skip to content

Commit f6c5f4d

Browse files
committed
Shrink Navigation Buttons
1 parent 659ff21 commit f6c5f4d

File tree

1 file changed

+102
-22
lines changed

1 file changed

+102
-22
lines changed

Files UWP/ProHome.xaml

Lines changed: 102 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,82 @@
450450
</Page.Resources>
451451

452452
<Grid Padding="0,0,0,0">
453+
<Grid.Resources>
454+
<Style x:Key="NavigationButtonNormalStyle" TargetType="Button">
455+
<Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
456+
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
457+
<Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
458+
<Setter Property="FontSize" Value="16" />
459+
<Setter Property="Height" Value="{ThemeResource NavigationBackButtonHeight}" />
460+
<Setter Property="Width" Value="{ThemeResource NavigationBackButtonWidth}" />
461+
<Setter Property="HorizontalContentAlignment" Value="Center" />
462+
<Setter Property="VerticalContentAlignment" Value="Center" />
463+
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
464+
<Setter Property="Template">
465+
<Setter.Value>
466+
<ControlTemplate TargetType="Button">
467+
<Grid x:Name="RootGrid"
468+
Background="{TemplateBinding Background}">
469+
470+
<VisualStateManager.VisualStateGroups>
471+
<VisualStateGroup x:Name="CommonStates">
472+
<VisualState x:Name="Normal" />
473+
474+
<VisualState x:Name="PointerOver">
475+
476+
<Storyboard>
477+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
478+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListLowBrush}" />
479+
</ObjectAnimationUsingKeyFrames>
480+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
481+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
482+
</ObjectAnimationUsingKeyFrames>
483+
</Storyboard>
484+
</VisualState>
485+
486+
<VisualState x:Name="Pressed">
487+
488+
<Storyboard>
489+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
490+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
491+
</ObjectAnimationUsingKeyFrames>
492+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
493+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
494+
</ObjectAnimationUsingKeyFrames>
495+
</Storyboard>
496+
</VisualState>
497+
498+
<VisualState x:Name="Disabled">
499+
500+
<Storyboard>
501+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
502+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlDisabledBaseMediumLowBrush}" />
503+
</ObjectAnimationUsingKeyFrames>
504+
</Storyboard>
505+
</VisualState>
506+
507+
</VisualStateGroup>
508+
509+
</VisualStateManager.VisualStateGroups>
510+
<FontIcon
511+
x:Name="Content"
512+
FontSize="{TemplateBinding FontSize}"
513+
FontFamily="{TemplateBinding FontFamily}"
514+
Glyph="{TemplateBinding Content}"
515+
MirroredWhenRightToLeft="True"
516+
Foreground="{TemplateBinding Foreground}"
517+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
518+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
519+
AutomationProperties.AccessibilityView="Raw" />
520+
521+
</Grid>
522+
523+
</ControlTemplate>
524+
</Setter.Value>
525+
</Setter>
526+
</Style>
527+
</Grid.Resources>
528+
453529
<VisualStateManager.VisualStateGroups>
454530
<VisualStateGroup>
455531
<!--VisualState to be triggered when window width is between 0 - 800 effective pixels.-->
@@ -633,36 +709,40 @@
633709
<ColumnDefinition MinWidth="24" Width="Auto"/>
634710
</Grid.ColumnDefinitions>
635711
<StackPanel Grid.Column="0" Orientation="Horizontal">
636-
<AppBarButton Icon="Back" LabelPosition="Collapsed" x:Name="Back">
637-
<AppBarButton.KeyboardAccelerators>
712+
<Button Style="{StaticResource NavigationBackButtonNormalStyle}" x:Name="Back">
713+
<Button.KeyboardAccelerators>
638714
<KeyboardAccelerator Modifiers="Menu" Key="Left"/>
639715
<KeyboardAccelerator Key="XButton1"/>
640-
</AppBarButton.KeyboardAccelerators>
641-
</AppBarButton>
716+
</Button.KeyboardAccelerators>
717+
</Button>
642718

643-
<AppBarButton Icon="Forward" LabelPosition="Collapsed" x:Name="Forward">
644-
<AppBarButton.KeyboardAccelerators>
719+
<Button Style="{StaticResource NavigationButtonNormalStyle}" x:Name="Forward">
720+
<Button.Content>
721+
&#xE72A;
722+
</Button.Content>
723+
<Button.KeyboardAccelerators>
645724
<KeyboardAccelerator Modifiers="Menu" Key="Right"/>
646725
<KeyboardAccelerator Key="XButton2"/>
647-
</AppBarButton.KeyboardAccelerators>
648-
</AppBarButton>
649-
650-
<AppBarButton Visibility="Collapsed" Icon="Up" LabelPosition="Collapsed" x:Name="Up">
651-
<AppBarButton.KeyboardAccelerators>
726+
</Button.KeyboardAccelerators>
727+
</Button>
728+
729+
<Button Visibility="Collapsed" Style="{StaticResource NavigationButtonNormalStyle}" x:Name="Up">
730+
<Button.Content>
731+
&#xE74A;
732+
</Button.Content>
733+
<Button.KeyboardAccelerators>
652734
<KeyboardAccelerator Modifiers="Menu" Key="Up"/>
653-
</AppBarButton.KeyboardAccelerators>
654-
</AppBarButton>
735+
</Button.KeyboardAccelerators>
736+
</Button>
655737

656-
<AppBarButton LabelPosition="Collapsed" Label="Refresh" x:Name="Refresh" >
657-
<AppBarButton.ContentTemplate>
658-
<DataTemplate>
659-
<TextBlock Text="&#xE72C;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
660-
</DataTemplate>
661-
</AppBarButton.ContentTemplate>
662-
<AppBarButton.KeyboardAccelerators>
738+
<Button Style="{StaticResource NavigationButtonNormalStyle}" x:Name="Refresh" >
739+
<Button.Content>
740+
&#xE72C;
741+
</Button.Content>
742+
<Button.KeyboardAccelerators>
663743
<KeyboardAccelerator Key="F5"/>
664-
</AppBarButton.KeyboardAccelerators>
665-
</AppBarButton>
744+
</Button.KeyboardAccelerators>
745+
</Button>
666746
</StackPanel>
667747
<TextBox Margin="5" HorizontalAlignment="Stretch" BorderBrush="DarkGray" Text="{x:Bind PathText.Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Windows10version1809:CornerRadius="2" Grid.Column="1" KeyDown="VisiblePath_TextChanged" Style="{StaticResource TextBoxStyleForPathBar}" BorderThickness="1" x:Name="VisiblePath" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="14" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Stretch" Padding="5" PlaceholderText="Enter a path">
668748

0 commit comments

Comments
 (0)