Skip to content

Commit 76de3cb

Browse files
committed
Larger rename text box in list wiew
1 parent f4ddd25 commit 76de3cb

File tree

2 files changed

+36
-7
lines changed

2 files changed

+36
-7
lines changed

src/Files.App/Views/LayoutModes/GridViewBrowser.xaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
<DataTemplate x:Name="TilesBrowserTemplate" x:DataType="filesystem:ListedItem">
248248
<UserControl>
249249
<Grid
250+
x:Name="MainGrid"
250251
MaxHeight="68"
251252
Padding="0"
252253
HorizontalAlignment="Left"
@@ -402,12 +403,17 @@
402403
<TextBox
403404
x:Name="TileViewTextBoxItemName"
404405
Grid.Row="0"
406+
Padding="5 2 5 2"
407+
MaxHeight="60"
405408
HorizontalAlignment="Left"
406409
BeforeTextChanging="ItemNameTextBox_BeforeTextChanging"
407410
Text="{x:Bind Name, Mode=OneWay}"
411+
TextWrapping="Wrap"
412+
ScrollViewer.VerticalScrollBarVisibility="Auto"
408413
Visibility="Collapsed" />
409414

410415
<TextBlock
416+
x:Name="ItemFileFormat"
411417
Grid.Row="1"
412418
HorizontalAlignment="Left"
413419
FontSize="12px"
@@ -417,6 +423,7 @@
417423
TextWrapping="NoWrap" />
418424

419425
<TextBlock
426+
x:Name="ItemSize"
420427
Grid.Row="2"
421428
HorizontalAlignment="Left"
422429
FontSize="12px"

src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.UI.Xaml.Input;
1313
using Microsoft.UI.Xaml.Media;
1414
using Microsoft.UI.Xaml.Navigation;
15+
using Vanara.Extensions.Reflection;
1516
using Windows.Storage;
1617
using Windows.System;
1718
using Windows.UI.Core;
@@ -191,17 +192,30 @@ override public void StartRenameItem()
191192
}
192193
else
193194
{
194-
TextBlock textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
195+
TextBlock textBlockName = gridViewItem.FindDescendant("ItemName") as TextBlock;
196+
TextBlock textBlockFormat = gridViewItem.FindDescendant("ItemFileFormat") as TextBlock;
197+
TextBlock textBlockSize = gridViewItem.FindDescendant("ItemSize") as TextBlock;
195198
textBox = gridViewItem.FindDescendant("TileViewTextBoxItemName") as TextBox;
196-
textBox.Text = textBlock.Text;
197-
OldItemName = textBlock.Text;
198-
textBlock.Visibility = Visibility.Collapsed;
199+
Grid gridMain = gridViewItem.FindDescendant("MainGrid") as Grid;
200+
201+
textBox.Text = textBlockName.Text;
202+
OldItemName = textBlockName.Text;
203+
204+
textBlockName.Visibility = Visibility.Collapsed;
205+
textBlockFormat.Visibility = Visibility.Collapsed;
206+
textBlockSize.Visibility = Visibility.Collapsed;
199207
textBox.Visibility = Visibility.Visible;
208+
gridMain.ColumnDefinitions[0].Width = new GridLength(0);
209+
gridMain.ColumnDefinitions[1].Width = new GridLength(0);
200210

201211
if (textBox.FindParent<Grid>() is null)
202212
{
203-
textBlock.Visibility = Visibility.Visible;
213+
textBlockName.Visibility = Visibility.Visible;
214+
textBlockFormat.Visibility = Visibility.Visible;
215+
textBlockSize.Visibility = Visibility.Visible;
204216
textBox.Visibility = Visibility.Collapsed;
217+
gridMain.ColumnDefinitions[0].Width = GridLength.Auto;
218+
gridMain.ColumnDefinitions[1].Width = new GridLength(64);
205219
return;
206220
}
207221
}
@@ -247,9 +261,17 @@ protected override void EndRename(TextBox textBox)
247261
}
248262
else if (FolderSettings.LayoutMode == FolderLayoutModes.TilesView)
249263
{
250-
TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
264+
TextBlock? textBlockName = gridViewItem.FindDescendant("ItemName") as TextBlock;
265+
TextBlock? textBlockFormat = gridViewItem.FindDescendant("ItemFileFormat") as TextBlock;
266+
TextBlock? textBlockSize = gridViewItem.FindDescendant("ItemSize") as TextBlock;
267+
Grid? gridMain = gridViewItem.FindDescendant("MainGrid") as Grid;
268+
251269
textBox.Visibility = Visibility.Collapsed;
252-
textBlock!.Visibility = Visibility.Visible;
270+
textBlockName!.Visibility = Visibility.Visible;
271+
textBlockFormat!.Visibility = Visibility.Visible;
272+
textBlockSize!.Visibility = Visibility.Visible;
273+
gridMain.ColumnDefinitions[0].Width = GridLength.Auto;
274+
gridMain.ColumnDefinitions[1].Width = new GridLength(64);
253275
}
254276

255277
textBox!.LostFocus -= RenameTextBox_LostFocus;

0 commit comments

Comments
 (0)