From 40655eb6a2aae7bafd4d1c19f43a0ed583b5af9b Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 4 May 2025 10:09:18 -0400
Subject: [PATCH 1/4] POC

---
 .../UserControls/NavigationToolbar.xaml       | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index ef9e511e009c..8909e3e40f21 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -136,6 +136,33 @@
 				</Button.ContextFlyout>
 			</Button>
 
+			<Button
+				x:Name="FlyoutButton"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}"
+				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"
@@ -579,6 +606,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>

From fdf1fa2792acb3366218887f99d54522b49f1ad7 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 15 Jun 2025 16:19:06 -0400
Subject: [PATCH 2/4] Fix focus

---
 src/Files.App/UserControls/NavigationToolbar.xaml    | 1 +
 src/Files.App/UserControls/NavigationToolbar.xaml.cs | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index 8909e3e40f21..8a0e2f8e709d 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -138,6 +138,7 @@
 
 			<Button
 				x:Name="FlyoutButton"
+				LosingFocus="NavigationButtonOverflowFlyoutButton_LosingFocus"
 				Style="{StaticResource AddressToolbarButtonStyle}"
 				ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}"
 				Visibility="Collapsed">
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml.cs b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
index e2b093d36d22..ec76312246aa 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml.cs
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
@@ -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;
+		}
 	}
 }

From 6986603c49c4b147e963a0a64b648f7987ae6102 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 15 Jun 2025 16:21:34 -0400
Subject: [PATCH 3/4] Tooltip

---
 src/Files.App/Strings/en-US/Resources.resw        | 5 ++++-
 src/Files.App/UserControls/NavigationToolbar.xaml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 96109bb31ab5..4931374c0288 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -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>
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index 8a0e2f8e709d..6cc4d4a21918 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -115,7 +115,7 @@
 				AutomationProperties.Name="{x:Bind Commands.NavigateBack.Label, Mode=OneWay}"
 				Command="{x:Bind Commands.NavigateBack, Mode=OneWay}"
 				Style="{StaticResource AddressToolbarButtonStyle}"
-				ToolTipService.ToolTip="{x:Bind Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
+				ToolTipService.ToolTip="{helpers:ResourceString Name=SeeMore}">
 				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneTime}" />
 				<Button.ContextFlyout>
 					<MenuFlyout

From 05ca308cb57cf4a846390320090b8dbb5eb6bd2c Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 15 Jun 2025 16:22:06 -0400
Subject: [PATCH 4/4] Update NavigationToolbar.xaml

---
 src/Files.App/UserControls/NavigationToolbar.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index 6cc4d4a21918..792596a20033 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -115,7 +115,7 @@
 				AutomationProperties.Name="{x:Bind Commands.NavigateBack.Label, Mode=OneWay}"
 				Command="{x:Bind Commands.NavigateBack, Mode=OneWay}"
 				Style="{StaticResource AddressToolbarButtonStyle}"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=SeeMore}">
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
 				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneTime}" />
 				<Button.ContextFlyout>
 					<MenuFlyout
@@ -140,7 +140,7 @@
 				x:Name="FlyoutButton"
 				LosingFocus="NavigationButtonOverflowFlyoutButton_LosingFocus"
 				Style="{StaticResource AddressToolbarButtonStyle}"
-				ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}"
+				ToolTipService.ToolTip="{helpers:ResourceString Name=SeeMore}"
 				Visibility="Collapsed">
 				<FontIcon FontSize="14" Glyph="&#xE712;" />
 				<Button.Flyout>