Skip to content

Code Quality: Added navigation button overflow menu #17195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 15, 2025
Merged

Code Quality: Added navigation button overflow menu #17195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40655eb
POC
yaira2 May 4, 2025
fdf1fa2
Fix focus
yaira2 Jun 15, 2025
6986603
Tooltip
yaira2 Jun 15, 2025
05ca308
Update NavigationToolbar.xaml
yaira2 Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4245,8 +4245,11 @@
</data>
<data name="BreadcrumbBarChevronButtonToolTip" xml:space="preserve">
<value>Show child folders</value>
</data>
</data>
<data name="NoCommandsFound" xml:space="preserve">
<value>There are no commands containing {0}</value>
</data>
<data name="SeeMore" xml:space="preserve">
<value>See more</value>
</data>
</root>
53 changes: 53 additions & 0 deletions src/Files.App/UserControls/NavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,34 @@
</Button.ContextFlyout>
</Button>

<Button
x:Name="FlyoutButton"
LosingFocus="NavigationButtonOverflowFlyoutButton_LosingFocus"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{helpers:ResourceString Name=SeeMore}"
Visibility="Collapsed">
<FontIcon FontSize="14" Glyph="&#xE712;" />
<Button.Flyout>
<MenuFlyout Placement="BottomEdgeAlignedLeft">
<MenuFlyoutItem Command="{x:Bind Commands.NavigateForward, Mode=OneWay}" Text="{x:Bind Commands.NavigateForward.Label, Mode=OneWay}">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="{x:Bind Commands.NavigateForward.Glyph.BaseGlyph, Mode=OneTime}" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem Command="{x:Bind Commands.NavigateUp, Mode=OneWay}" Text="{x:Bind Commands.NavigateUp.Label, Mode=OneWay}">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="{x:Bind Commands.NavigateUp.Glyph.BaseGlyph, Mode=OneTime}" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem Command="{x:Bind Commands.RefreshItems, Mode=OneWay}" Text="{x:Bind Commands.RefreshItems.Label, Mode=OneWay}">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="{x:Bind Commands.RefreshItems.Glyph.BaseGlyph, Mode=OneTime}" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
</MenuFlyout>
</Button.Flyout>
</Button>

<Button
x:Name="Forward"
AccessKey="F"
Expand Down Expand Up @@ -579,6 +607,31 @@
Target="{x:Bind ShowStatusCenterButton}" />

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="NavigationStates">
<VisualState x:Name="Narrow">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="FlyoutButton.Visibility" Value="Visible" />
<Setter Target="Forward.Visibility" Value="Collapsed" />
<Setter Target="Up.Visibility" Value="Collapsed" />
<Setter Target="Refresh.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Wide">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="540" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="FlyoutButton.Visibility" Value="Collapsed" />
<Setter Target="Forward.Visibility" Value="Visible" />
<Setter Target="Up.Visibility" Value="Visible" />
<Setter Target="Refresh.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SearchBoxStates">
<VisualState x:Name="SearchBoxAlwaysShown">
<VisualState.StateTriggers>
Expand Down
7 changes: 7 additions & 0 deletions src/Files.App/UserControls/NavigationToolbar.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,5 +428,12 @@ private void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
}
}

private void NavigationButtonOverflowFlyoutButton_LosingFocus(UIElement sender, LosingFocusEventArgs args)
{
// Prevent the Omnibar from taking focus if the overflow button is hidden while the button is focused
if (args.NewFocusedElement is TextBox)
args.Cancel = true;
}
}
}
Loading