Feature: Added support for closing the left pane (#15614)

Co-authored-by: Yair <[email protected]>
Co-authored-by: hishitetsu <[email protected]>

Author: 3 people

src/Files.App/Actions/Navigation/ClosePaneAction.cs renamed to src/Files.App/Actions/Navigation/CloseActivePaneAction.cs

@@ -3,15 +3,15 @@
 
 namespace Files.App.Actions
 {
-	internal sealed class ClosePaneAction : ObservableObject, IAction
+	internal sealed class CloseActivePaneAction : ObservableObject, IAction
 	{
-		private readonly IContentPageContext context;
+		private IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		public string Label
-			=> "NavigationToolbarClosePane/Label".GetLocalizedResource();
+			=> "CloseActivePane".GetLocalizedResource();
 
 		public string Description
-			=> "ClosePaneDescription".GetLocalizedResource();
+			=> "CloseActivePaneDescription".GetLocalizedResource();
 
 		public HotKey HotKey
 			=> new(Keys.W, KeyModifiers.CtrlShift);
@@ -20,23 +20,20 @@ public RichGlyph Glyph
 			=> new("\uE89F");
 
 		public bool IsExecutable
-			=> context.IsMultiPaneActive;
+			=> ContentPageContext.IsMultiPaneActive;
 
-		public ClosePaneAction()
+		public CloseActivePaneAction()
 		{
-			context = Ioc.Default.GetRequiredService<IContentPageContext>();
-
-			context.PropertyChanged += Context_PropertyChanged;
+			ContentPageContext.PropertyChanged += ContentPageContext_PropertyChanged;
 		}
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			context.ShellPage!.PaneHolder.CloseSecondaryPane();
-
+			ContentPageContext.ShellPage?.PaneHolder.CloseActivePane();
 			return Task.CompletedTask;
 		}
 
-		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		private void ContentPageContext_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			switch (e.PropertyName)
 			{

src/Files.App/Data/Commands/Manager/CommandCodes.cs

@@ -186,7 +186,7 @@ public enum CommandCodes
 		NextTab,
 		CloseSelectedTab,
 		OpenNewPane,
-		ClosePane,
+		CloseActivePane,
 		FocusLeftPane,
 		FocusRightPane,
 

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -191,7 +191,7 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand NextTab => commands[CommandCodes.NextTab];
 		public IRichCommand CloseSelectedTab => commands[CommandCodes.CloseSelectedTab];
 		public IRichCommand OpenNewPane => commands[CommandCodes.OpenNewPane];
-		public IRichCommand ClosePane => commands[CommandCodes.ClosePane];
+		public IRichCommand CloseActivePane => commands[CommandCodes.CloseActivePane];
 		public IRichCommand FocusLeftPane => commands[CommandCodes.FocusLeftPane];
 		public IRichCommand FocusRightPane => commands[CommandCodes.FocusRightPane];
 		public IRichCommand OpenFileLocation => commands[CommandCodes.OpenFileLocation];
@@ -374,7 +374,7 @@ public IEnumerator<IRichCommand> GetEnumerator() =>
 			[CommandCodes.NextTab] = new NextTabAction(),
 			[CommandCodes.CloseSelectedTab] = new CloseSelectedTabAction(),
 			[CommandCodes.OpenNewPane] = new OpenNewPaneAction(),
-			[CommandCodes.ClosePane] = new ClosePaneAction(),
+			[CommandCodes.CloseActivePane] = new CloseActivePaneAction(),
 			[CommandCodes.FocusLeftPane] = new FocusLeftPaneAction(),
 			[CommandCodes.FocusRightPane] = new FocusRightPaneAction(),
 			[CommandCodes.OpenFileLocation] = new OpenFileLocationAction(),

src/Files.App/Data/Commands/Manager/ICommandManager.cs

@@ -171,7 +171,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand NextTab { get; }
 		IRichCommand CloseSelectedTab { get; }
 		IRichCommand OpenNewPane { get; }
-		IRichCommand ClosePane { get; }
+		IRichCommand CloseActivePane { get; }
 		IRichCommand FocusLeftPane { get; }
 		IRichCommand FocusRightPane { get; }
 

src/Files.App/Data/Contracts/IShellPanesPage.cs

@@ -16,7 +16,7 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged
 
 		public void OpenSecondaryPane(string path);
 
-		public void CloseSecondaryPane();
+		public void CloseActivePane();
 
 		public void FocusLeftPane();
 

src/Files.App/Strings/en-US/Resources.resw

@@ -1583,8 +1583,8 @@
   <data name="SecurityAdvancedReplaceChildPermissions2.ToolTipService.ToolTip" xml:space="preserve">
     <value>Replace all child object permissions entries with inheritable permission entries from this object</value>
   </data>
-  <data name="NavigationToolbarClosePane.Label" xml:space="preserve">
-    <value>Close pane</value>
+  <data name="CloseActivePane" xml:space="preserve">
+    <value>Close active pane</value>
   </data>
   <data name="EnterCompactOverlay" xml:space="preserve">
     <value>Enter compact overlay</value>
@@ -2672,8 +2672,8 @@
   <data name="OpenNewPaneDescription" xml:space="preserve">
     <value>Open new pane</value>
   </data>
-  <data name="ClosePaneDescription" xml:space="preserve">
-    <value>Close right pane</value>
+  <data name="CloseActivePaneDescription" xml:space="preserve">
+    <value>Close active pane</value>
   </data>
   <data name="FocusLeftPane" xml:space="preserve">
     <value>Focus left pane</value>

src/Files.App/UserControls/InnerNavigationToolbar.xaml

@@ -1226,7 +1226,7 @@
 					</AppBarButton.Icon>
 				</AppBarButton>
 
-				<!--  Open Pane  -->
+				<!--  Open New Pane  -->
 				<AppBarButton
 					x:Name="NavToolbarNewPane"
 					x:Load="{x:Bind Commands.OpenNewPane.IsExecutable, Mode=OneWay}"
@@ -1236,15 +1236,15 @@
 					<local:OpacityIcon Style="{x:Bind Commands.OpenNewPane.OpacityStyle}" />
 				</AppBarButton>
 
-				<!--  Close Pane  -->
+				<!--  Close Active Pane  -->
 				<AppBarButton
-					x:Name="NavToolbarClosePane"
-					x:Load="{x:Bind Commands.ClosePane.IsExecutable, Mode=OneWay}"
-					Command="{x:Bind Commands.ClosePane, Mode=OneWay}"
-					Label="{x:Bind Commands.ClosePane.Label}"
-					ToolTipService.ToolTip="{x:Bind Commands.ClosePane.LabelWithHotKey, Mode=OneWay}">
+					x:Name="NavToolbarCloseActivePane"
+					x:Load="{x:Bind Commands.CloseActivePane.IsExecutable, Mode=OneWay}"
+					Command="{x:Bind Commands.CloseActivePane, Mode=OneWay}"
+					Label="{x:Bind Commands.CloseActivePane.Label}"
+					ToolTipService.ToolTip="{x:Bind Commands.CloseActivePane.LabelWithHotKey, Mode=OneWay}">
 					<AppBarButton.Icon>
-						<FontIcon Foreground="{ThemeResource App.Theme.IconBaseBrush}" Glyph="{x:Bind Commands.ClosePane.Glyph.BaseGlyph}" />
+						<FontIcon Foreground="{ThemeResource App.Theme.IconBaseBrush}" Glyph="{x:Bind Commands.CloseActivePane.Glyph.BaseGlyph}" />
 					</AppBarButton.Icon>
 				</AppBarButton>
 

src/Files.App/Views/ShellPanesPage.xaml.cs

@@ -188,23 +188,23 @@ public bool IsRightPaneVisible
 				if (value != _IsRightPaneVisible)
 				{
 					_IsRightPaneVisible = value;
-					if (!_IsRightPaneVisible)
-					{
-						ActivePane = GetPane(0);
-						Pane_ContentChanged(null!, null!);
-					}
-
-					NotifyPropertyChanged(nameof(IsRightPaneVisible));
-					NotifyPropertyChanged(nameof(IsMultiPaneActive));
 
 					if (value)
 					{
 						AddPane();
 					}
 					else
 					{
-						RemovePane((RootGrid.Children.Count - 1) / 2);
+						if (GetPaneCount() != 1)
+						{
+							ActivePane = GetPane(0);
+							Pane_ContentChanged(null!, null!);
+							RemovePane((RootGrid.Children.Count - 1) / 2);
+						}
 					}
+
+					NotifyPropertyChanged(nameof(IsRightPaneVisible));
+					NotifyPropertyChanged(nameof(IsMultiPaneActive));
 				}
 			}
 		}
@@ -272,10 +272,12 @@ public void OpenSecondaryPane(string path)
 			ActivePane = GetPane(1);
 		}
 
-		public void CloseSecondaryPane()
+		public void CloseActivePane()
 		{
-			// Remove right pane within this property's setter
-			IsRightPaneVisible = false;
+			if (ActivePane == (IShellPage)GetPane(0))
+				RemovePane(0);
+			else
+				IsRightPaneVisible = false;
 
 			GetPane(0)?.Focus(FocusState.Programmatic);
 			SetShadow();
@@ -346,7 +348,6 @@ private void AddPane()
 			NotifyPropertyChanged(nameof(IsMultiPaneActive));
 		}
 
-		// TODO: Shift column index for when to close left pane
 		private void RemovePane(int index = -1)
 		{
 			if (index is -1)
@@ -355,14 +356,35 @@ private void RemovePane(int index = -1)
 			// Get proper position of sizer that resides with the pane that is wanted to be removed
 			var childIndex = index * 2 - 1;
 			childIndex = childIndex >= 0 ? childIndex : 0;
+			if (childIndex >= RootGrid.Children.Count)
+				return;
+
+			if (childIndex == 0)
+			{
+				var wasMultiPaneActive = IsMultiPaneActive;
 
-			// Remove sizer and pane from children
-			RootGrid.Children.RemoveAt(childIndex);
-			RootGrid.Children.RemoveAt(childIndex);
+				// Remove sizer and pane
+				RootGrid.Children.RemoveAt(0);
+				RootGrid.ColumnDefinitions.RemoveAt(0);
 
-			// Remove sizer and pane from column definitions
-			RootGrid.ColumnDefinitions.RemoveAt(childIndex);
-			RootGrid.ColumnDefinitions.RemoveAt(childIndex);
+				if (wasMultiPaneActive)
+				{
+					RootGrid.Children.RemoveAt(0);
+					RootGrid.ColumnDefinitions.RemoveAt(0);
+					RootGrid.Children[0].SetValue(Grid.ColumnProperty, 0);
+					_NavParamsLeft = new() { NavPath = GetPane(0)?.TabBarItemParameter?.NavigationParameter as string ?? string.Empty };
+					IsRightPaneVisible = false;
+					ActivePane = GetPane(0);
+				}
+			}
+			else
+			{
+				// Remove sizer and pane
+				RootGrid.Children.RemoveAt(childIndex);
+				RootGrid.Children.RemoveAt(childIndex);
+				RootGrid.ColumnDefinitions.RemoveAt(childIndex);
+				RootGrid.ColumnDefinitions.RemoveAt(childIndex);
+			}
 
 			NotifyPropertyChanged(nameof(IsMultiPaneActive));
 		}