From 9fa8929c5b196431e30f529529144559eb4be692 Mon Sep 17 00:00:00 2001
From: Saravanan Ganapathi <workbysaran@gmail.com>
Date: Thu, 31 Jul 2025 19:07:25 +0530
Subject: [PATCH 1/4] ### **Resolved / Related Issues**

Closes [Feature: Make columns resizable in Column Layout](https://github.com/files-community/Files/issues/6534)

---

### **Steps used to test these changes**

1. Opened Files and confirmed that:
   - Columns are resizable using the splitter between them
   - Cursor changes to a resize icon when hovering over the column divider
   - Double-clicking the divider resets to default width
   - Content inside each column adjusts correctly to new width
   - No visual glitches appear when resizing multiple columns rapidly

2. Verified that:
   - Column resizing works with mouse.
   - Resizing does not interfere with item selection, list scroll or navigation
   - Minimum and maximum column widths are respected
---
 src/Files.App.Controls/BladeView/BladeItem.cs | 85 +++++++++++++++++++
 .../BladeView/BladeView.xaml                  | 45 ++++++++++
 .../Files.App.Launcher.exe.sha256             |  2 +-
 3 files changed, 131 insertions(+), 1 deletion(-)

diff --git a/src/Files.App.Controls/BladeView/BladeItem.cs b/src/Files.App.Controls/BladeView/BladeItem.cs
index 0ba8f525f6c0..10b2a54e3f83 100644
--- a/src/Files.App.Controls/BladeView/BladeItem.cs
+++ b/src/Files.App.Controls/BladeView/BladeItem.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.UI.Input;
 using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Input;
 
 namespace Files.App.Controls
 {
@@ -11,7 +13,14 @@ namespace Files.App.Controls
 	[TemplatePart(Name = "CloseButton", Type = typeof(Button))]
 	public partial class BladeItem : ContentControl
 	{
+		private const double MINIMUM_WIDTH = 150;
+		private const double DEFAULT_WIDTH = 300; // Default width for the blade item
+
 		private Button _closeButton;
+		private Border _bladeResizer;
+		private bool draggingSidebarResizer;
+		private double preManipulationSidebarWidth = 0;
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="BladeItem"/> class.
 		/// </summary>
@@ -36,7 +45,31 @@ protected override void OnApplyTemplate()
 
 			_closeButton.Click -= CloseButton_Click;
 			_closeButton.Click += CloseButton_Click;
+
+			_bladeResizer = GetTemplateChild("BladeResizer") as Border;
+
+			if (_bladeResizer != null)
+			{
+				_bladeResizer.ManipulationStarted -= BladeResizer_ManipulationStarted;
+				_bladeResizer.ManipulationStarted += BladeResizer_ManipulationStarted;
+
+				_bladeResizer.ManipulationDelta -= BladeResizer_ManipulationDelta;
+				_bladeResizer.ManipulationDelta += BladeResizer_ManipulationDelta;
+
+				_bladeResizer.ManipulationCompleted -= BladeResizer_ManipulationCompleted;
+				_bladeResizer.ManipulationCompleted += BladeResizer_ManipulationCompleted;
+
+				_bladeResizer.PointerEntered -= BladeResizer_PointerEntered;
+				_bladeResizer.PointerEntered += BladeResizer_PointerEntered;
+
+				_bladeResizer.PointerExited -= BladeResizer_PointerExited;
+				_bladeResizer.PointerExited += BladeResizer_PointerExited;
+
+				_bladeResizer.DoubleTapped -= BladeResizer_DoubleTapped;
+				_bladeResizer.DoubleTapped += BladeResizer_DoubleTapped;
+			}
 		}
+
 		/// <summary>
 		/// Creates AutomationPeer (<see cref="UIElement.OnCreateAutomationPeer"/>)
 		/// </summary>
@@ -50,5 +83,57 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
 		{
 			IsOpen = false;
 		}
+		private void BladeResizer_ManipulationStarted(object sender, ManipulationStartedRoutedEventArgs e)
+		{
+			draggingSidebarResizer = true;
+			preManipulationSidebarWidth = ActualWidth;
+			VisualStateManager.GoToState(this, "ResizerPressed", true);
+			e.Handled = true;
+		}
+
+		private void BladeResizer_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
+		{
+			var newWidth = preManipulationSidebarWidth + e.Cumulative.Translation.X;
+			
+			Debug.WriteLine($"BladeResizer - New item width: {newWidth}");
+			
+			if (newWidth < MINIMUM_WIDTH)
+				newWidth = MINIMUM_WIDTH;
+
+			Width = newWidth;
+			e.Handled = true;
+		}
+
+		private void BladeResizer_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+		{
+			draggingSidebarResizer = false;
+			VisualStateManager.GoToState(this, "ResizerNormal", true);
+			e.Handled = true;
+		}
+
+		private void BladeResizer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+		{
+			Width = DEFAULT_WIDTH;
+			e.Handled = true;
+		}
+
+		private void BladeResizer_PointerEntered(object sender, PointerRoutedEventArgs e)
+		{
+			var sidebarResizer = (FrameworkElement)sender;
+			sidebarResizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
+			VisualStateManager.GoToState(this, "ResizerPointerOver", true);
+			e.Handled = true;
+		}
+
+		private void BladeResizer_PointerExited(object sender, PointerRoutedEventArgs e)
+		{
+			if (draggingSidebarResizer)
+				return;
+
+			var sidebarResizer = (FrameworkElement)sender;
+			sidebarResizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow));
+			VisualStateManager.GoToState(this, "ResizerNormal", true);
+			e.Handled = true;
+		}
 	}
 }
diff --git a/src/Files.App.Controls/BladeView/BladeView.xaml b/src/Files.App.Controls/BladeView/BladeView.xaml
index 82a593fed509..a638961df576 100644
--- a/src/Files.App.Controls/BladeView/BladeView.xaml
+++ b/src/Files.App.Controls/BladeView/BladeView.xaml
@@ -114,6 +114,24 @@
 							VerticalAlignment="Stretch"
 							Background="{TemplateBinding Background}" />
 
+						<!--  Resizer  -->
+						<Border
+							x:Name="BladeResizer"
+							Width="4"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Stretch"
+							AllowFocusOnInteraction="True"
+							Background="Transparent"
+							BorderBrush="Transparent"
+							CornerRadius="2"
+							DoubleTapped="BladeResizer_DoubleTapped"
+							ManipulationCompleted="BladeResizer_ManipulationCompleted"
+							ManipulationDelta="BladeResizer_ManipulationDelta"
+							ManipulationMode="TranslateX"
+							ManipulationStarted="BladeResizer_ManipulationStarted"
+							PointerEntered="BladeResizer_PointerEntered"
+							PointerExited="BladeResizer_PointerExited" />
+
 						<Button
 							Name="CloseButton"
 							HorizontalAlignment="Right"
@@ -127,6 +145,33 @@
 							Style="{StaticResource ButtonRevealStyle}"
 							TabIndex="0"
 							Visibility="{TemplateBinding CloseButtonVisibility}" />
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="ResizerStates">
+								<VisualState x:Name="ResizerNormal" />
+								<VisualState x:Name="ResizerPointerOver">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BladeResizer" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CardStrokeColorDefaultSolidBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BladeResizer" Storyboard.TargetProperty="BorderBrush">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CardStrokeColorDefaultSolidBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+
+								<VisualState x:Name="ResizerPressed">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BladeResizer" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SolidBackgroundFillColorSecondaryBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BladeResizer" Storyboard.TargetProperty="BorderBrush">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SolidBackgroundFillColorSecondaryBrush}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256 b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
index 11864831640e..55c47a66b880 100644
--- a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
+++ b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
@@ -1 +1 @@
-cb1ca000ef2f03f1afc7bde9ed4fb2987669c89a58b63919e67574696091f60f
+675e2af6383af3d850edd90be04a39cc57a15d9d271546aceeaf576d0a06da21

From b93ea3c085f14a0fae4ef4e403379eef0adcf1d5 Mon Sep 17 00:00:00 2001
From: Saravanan Ganapathi <workbysaran@gmail.com>
Date: Thu, 31 Jul 2025 19:49:39 +0530
Subject: [PATCH 2/4] Fix: Revert unintended change to
 Files.App.Launcher.exe.sha256

Signed-off-by: Saravanan Ganapathi <workbysaran@gmail.com>
---
 .../Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256 b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
index 55c47a66b880..11864831640e 100644
--- a/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
+++ b/src/Files.App/Assets/FilesOpenDialog/Files.App.Launcher.exe.sha256
@@ -1 +1 @@
-675e2af6383af3d850edd90be04a39cc57a15d9d271546aceeaf576d0a06da21
+cb1ca000ef2f03f1afc7bde9ed4fb2987669c89a58b63919e67574696091f60f

From ca06d953c4cfcd5e757ea1c66e8c60120a2f8e28 Mon Sep 17 00:00:00 2001
From: Saravanan Ganapathi <workbysaran@gmail.com>
Date: Fri, 1 Aug 2025 00:02:51 +0530
Subject: [PATCH 3/4] **Resolved / Related Issues**

Partially addresses #6534
- [x] Support for resizing columns
- [ ] Columns sizes should be saved across sessions
- [x] Double clicking the resize bar should size the column to fit

**Steps used to test these changes**

1. Opened Files and confirmed that:
   - Double-clicking the divider set the size the column to fit

2. Verified that:
   - Column auto resizing work
---
 src/Files.App.Controls/BladeView/BladeItem.cs | 141 ++++++++++++++++--
 1 file changed, 132 insertions(+), 9 deletions(-)

diff --git a/src/Files.App.Controls/BladeView/BladeItem.cs b/src/Files.App.Controls/BladeView/BladeItem.cs
index 10b2a54e3f83..b49ed786f856 100644
--- a/src/Files.App.Controls/BladeView/BladeItem.cs
+++ b/src/Files.App.Controls/BladeView/BladeItem.cs
@@ -1,9 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Windows.Foundation;
 
 namespace Files.App.Controls
 {
@@ -18,8 +21,8 @@ public partial class BladeItem : ContentControl
 
 		private Button _closeButton;
 		private Border _bladeResizer;
-		private bool draggingSidebarResizer;
-		private double preManipulationSidebarWidth = 0;
+		private bool _draggingSidebarResizer;
+		private double _preManipulationSidebarWidth = 0;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="BladeItem"/> class.
@@ -67,7 +70,7 @@ protected override void OnApplyTemplate()
 
 				_bladeResizer.DoubleTapped -= BladeResizer_DoubleTapped;
 				_bladeResizer.DoubleTapped += BladeResizer_DoubleTapped;
-			}
+			}			
 		}
 
 		/// <summary>
@@ -83,17 +86,18 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
 		{
 			IsOpen = false;
 		}
+
 		private void BladeResizer_ManipulationStarted(object sender, ManipulationStartedRoutedEventArgs e)
 		{
-			draggingSidebarResizer = true;
-			preManipulationSidebarWidth = ActualWidth;
+			_draggingSidebarResizer = true;
+			_preManipulationSidebarWidth = ActualWidth;
 			VisualStateManager.GoToState(this, "ResizerPressed", true);
 			e.Handled = true;
 		}
 
 		private void BladeResizer_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
 		{
-			var newWidth = preManipulationSidebarWidth + e.Cumulative.Translation.X;
+			var newWidth = _preManipulationSidebarWidth + e.Cumulative.Translation.X;
 			
 			Debug.WriteLine($"BladeResizer - New item width: {newWidth}");
 			
@@ -106,17 +110,136 @@ private void BladeResizer_ManipulationDelta(object sender, ManipulationDeltaRout
 
 		private void BladeResizer_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
 		{
-			draggingSidebarResizer = false;
+			_draggingSidebarResizer = false;
 			VisualStateManager.GoToState(this, "ResizerNormal", true);
 			e.Handled = true;
 		}
 
 		private void BladeResizer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 		{
-			Width = DEFAULT_WIDTH;
+			var optimalWidth = CalculateOptimalWidth();
+			if (optimalWidth > 0)
+			{
+				Width = Math.Max(optimalWidth, MINIMUM_WIDTH);
+			}
+			else
+			{
+				// Fallback to default width if calculation fails
+				Width = DEFAULT_WIDTH;
+			}
+
 			e.Handled = true;
 		}
 
+		private double CalculateOptimalWidth()
+		{
+			try
+			{
+				// Look for any ListView within this BladeItem that contains text content
+				var listView = this.FindDescendant<ListView>();
+				if (listView?.Items == null || !listView.Items.Any())
+					return 0;
+
+				// Calculate the maximum width needed by measuring text content
+				var maxTextWidth = MeasureContentWidth(listView);
+
+				// Add padding for icon, margins, and other UI elements
+				// Icon width (32) + margins (24) + padding (24) + chevron/tags (40) = 120
+				var totalPadding = 120;
+
+				return maxTextWidth + totalPadding;
+			}
+			catch (Exception ex)
+			{
+				Debug.WriteLine($"Error calculating optimal width: {ex.Message}");
+				return 0;
+			}
+		}
+
+		private double MeasureContentWidth(ListView listView)
+		{
+			try
+			{
+				double maxWidth = 0;
+
+				// Find all TextBlocks in the ListView using visual tree walking
+				var textBlocks = GetTextBlocksFromVisualTree(listView);
+
+				if (textBlocks.Any())
+				{
+					// Measure each TextBlock and find the widest one
+					foreach (var textBlock in textBlocks)
+					{
+						if (string.IsNullOrEmpty(textBlock.Text))
+							continue;
+
+						// Create a measuring TextBlock with the same properties
+						var measuringBlock = new TextBlock
+						{
+							Text = textBlock.Text,
+							FontSize = textBlock.FontSize,
+							FontFamily = textBlock.FontFamily,
+							FontWeight = textBlock.FontWeight,
+							FontStyle = textBlock.FontStyle
+						};
+
+						measuringBlock.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+						maxWidth = Math.Max(maxWidth, measuringBlock.DesiredSize.Width);
+					}
+				}
+				else
+				{
+					// Fallback: estimate based on item count and average text width
+					var itemCount = listView.Items.Count;
+					if (itemCount > 0)
+					{
+						// Estimate average filename length and multiply by character width
+						var estimatedCharWidth = 8; // Approximate pixel width per character
+						var estimatedMaxLength = Math.Min(50, Math.Max(20, itemCount * 2)); // Heuristic
+						maxWidth = estimatedCharWidth * estimatedMaxLength;
+					}
+				}
+
+				return maxWidth;
+			}
+			catch (Exception ex)
+			{
+				Debug.WriteLine($"Error measuring content width: {ex.Message}");
+				// Fallback calculation
+				return 200; // Default reasonable width
+			}
+		}
+		private List<TextBlock> GetTextBlocksFromVisualTree(DependencyObject parent)
+		{
+			var textBlocks = new List<TextBlock>();
+
+			if (parent == null)
+				return textBlocks;
+
+			try
+			{
+				var childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+				for (int i = 0; i < childrenCount; i++)
+				{
+					var child = VisualTreeHelper.GetChild(parent, i);
+
+					if (child is TextBlock textBlock)
+					{
+						textBlocks.Add(textBlock);
+					}
+
+					// Recursively search child elements
+					textBlocks.AddRange(GetTextBlocksFromVisualTree(child));
+				}
+			}
+			catch (Exception ex)
+			{
+				Debug.WriteLine($"Error walking visual tree: {ex.Message}");
+			}
+
+			return textBlocks;
+		}
+
 		private void BladeResizer_PointerEntered(object sender, PointerRoutedEventArgs e)
 		{
 			var sidebarResizer = (FrameworkElement)sender;
@@ -127,7 +250,7 @@ private void BladeResizer_PointerEntered(object sender, PointerRoutedEventArgs e
 
 		private void BladeResizer_PointerExited(object sender, PointerRoutedEventArgs e)
 		{
-			if (draggingSidebarResizer)
+			if (_draggingSidebarResizer)
 				return;
 
 			var sidebarResizer = (FrameworkElement)sender;

From 5a1244779e5a63b341e00ca31159de8abcf3220d Mon Sep 17 00:00:00 2001
From: Saravanan Ganapathi <workbysaran@gmail.com>
Date: Fri, 1 Aug 2025 10:27:16 +0530
Subject: [PATCH 4/4] **Changes based on PR suggestions as per #17380**

- Removed debug logging for error messages in `BladeItem.cs` to streamline the code.
- Cleaned up `BladeView.xaml` by removing unnecessary event handlers related to `BladeResizer`.
- Fixed whitespace-related issues.
---
 src/Files.App.Controls/BladeView/BladeItem.cs | 37 +++++++------------
 .../BladeView/BladeView.xaml                  |  8 +---
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/Files.App.Controls/BladeView/BladeItem.cs b/src/Files.App.Controls/BladeView/BladeItem.cs
index b49ed786f856..a96dd33afeb4 100644
--- a/src/Files.App.Controls/BladeView/BladeItem.cs
+++ b/src/Files.App.Controls/BladeView/BladeItem.cs
@@ -70,7 +70,7 @@ protected override void OnApplyTemplate()
 
 				_bladeResizer.DoubleTapped -= BladeResizer_DoubleTapped;
 				_bladeResizer.DoubleTapped += BladeResizer_DoubleTapped;
-			}			
+			}
 		}
 
 		/// <summary>
@@ -98,9 +98,6 @@ private void BladeResizer_ManipulationStarted(object sender, ManipulationStarted
 		private void BladeResizer_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
 		{
 			var newWidth = _preManipulationSidebarWidth + e.Cumulative.Translation.X;
-			
-			Debug.WriteLine($"BladeResizer - New item width: {newWidth}");
-			
 			if (newWidth < MINIMUM_WIDTH)
 				newWidth = MINIMUM_WIDTH;
 
@@ -149,9 +146,8 @@ private double CalculateOptimalWidth()
 
 				return maxTextWidth + totalPadding;
 			}
-			catch (Exception ex)
+			catch (Exception)
 			{
-				Debug.WriteLine($"Error calculating optimal width: {ex.Message}");
 				return 0;
 			}
 		}
@@ -202,13 +198,13 @@ private double MeasureContentWidth(ListView listView)
 
 				return maxWidth;
 			}
-			catch (Exception ex)
+			catch (Exception)
 			{
-				Debug.WriteLine($"Error measuring content width: {ex.Message}");
 				// Fallback calculation
 				return 200; // Default reasonable width
 			}
 		}
+
 		private List<TextBlock> GetTextBlocksFromVisualTree(DependencyObject parent)
 		{
 			var textBlocks = new List<TextBlock>();
@@ -216,25 +212,18 @@ private List<TextBlock> GetTextBlocksFromVisualTree(DependencyObject parent)
 			if (parent == null)
 				return textBlocks;
 
-			try
+			var childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+			for (int i = 0; i < childrenCount; i++)
 			{
-				var childrenCount = VisualTreeHelper.GetChildrenCount(parent);
-				for (int i = 0; i < childrenCount; i++)
-				{
-					var child = VisualTreeHelper.GetChild(parent, i);
+				var child = VisualTreeHelper.GetChild(parent, i);
 
-					if (child is TextBlock textBlock)
-					{
-						textBlocks.Add(textBlock);
-					}
-
-					// Recursively search child elements
-					textBlocks.AddRange(GetTextBlocksFromVisualTree(child));
+				if (child is TextBlock textBlock)
+				{
+					textBlocks.Add(textBlock);
 				}
-			}
-			catch (Exception ex)
-			{
-				Debug.WriteLine($"Error walking visual tree: {ex.Message}");
+
+				// Recursively search child elements
+				textBlocks.AddRange(GetTextBlocksFromVisualTree(child));
 			}
 
 			return textBlocks;
diff --git a/src/Files.App.Controls/BladeView/BladeView.xaml b/src/Files.App.Controls/BladeView/BladeView.xaml
index a638961df576..98ebd4d629be 100644
--- a/src/Files.App.Controls/BladeView/BladeView.xaml
+++ b/src/Files.App.Controls/BladeView/BladeView.xaml
@@ -124,13 +124,7 @@
 							Background="Transparent"
 							BorderBrush="Transparent"
 							CornerRadius="2"
-							DoubleTapped="BladeResizer_DoubleTapped"
-							ManipulationCompleted="BladeResizer_ManipulationCompleted"
-							ManipulationDelta="BladeResizer_ManipulationDelta"
-							ManipulationMode="TranslateX"
-							ManipulationStarted="BladeResizer_ManipulationStarted"
-							PointerEntered="BladeResizer_PointerEntered"
-							PointerExited="BladeResizer_PointerExited" />
+							ManipulationMode="TranslateX" />
 
 						<Button
 							Name="CloseButton"