Skip to content
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

Feature: Increased the text box height when renaming items in the tiles layout #13114

Merged
merged 14 commits into from
Sep 21, 2023
Merged

Feature: Increased the text box height when renaming items in the tiles layout #13114

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
76de3cb
Larger rename text box in list wiew
KlenAr313 Aug 1, 2023
92ac7cf
Biger textbox in GridView, del padding
KlenAr313 Aug 2, 2023
06a0e4e
Formatting
KlenAr313 Aug 2, 2023
cf248de
Larger rename text box in list wiew
KlenAr313 Aug 1, 2023
4c2c8d9
Biger textbox in GridView, del padding
KlenAr313 Aug 2, 2023
959b276
Formatting
KlenAr313 Aug 2, 2023
b9a2c70
Merge branch 'larger_rename_textbox' of https://github.com/KlenAr313/…
KlenAr313 Aug 2, 2023
7aed8ec
Simpler code, deleting unnecessary names, and visibility changes
KlenAr313 Aug 7, 2023
1c757b2
Revert name changes
KlenAr313 Aug 7, 2023
d85c865
Merge branch 'main' into larger_rename_textbox
yaira2 Sep 21, 2023
0e3ec36
Update GridViewBrowser.xaml.cs
yaira2 Sep 21, 2023
8146b8c
Cleanup xaml
yaira2 Sep 21, 2023
879bab8
Update GridViewBrowser.xaml
yaira2 Sep 21, 2023
0d31c58
Update GridViewBrowser.xaml
yaira2 Sep 21, 2023
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
6 changes: 6 additions & 0 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@
<DataTemplate x:Name="TilesBrowserTemplate" x:DataType="filesystem:ListedItem">
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
<UserControl>
<Grid
x:Name="MainGrid"
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
MaxHeight="68"
Padding="0"
HorizontalAlignment="Left"
Expand Down Expand Up @@ -402,12 +403,16 @@
<TextBox
x:Name="TileViewTextBoxItemName"
Grid.Row="0"
MaxHeight="60"
HorizontalAlignment="Left"
BeforeTextChanging="ItemNameTextBox_BeforeTextChanging"
ScrollViewer.VerticalScrollBarVisibility="Auto"
Text="{x:Bind Name, Mode=OneWay}"
TextWrapping="Wrap"
Visibility="Collapsed" />

<TextBlock
x:Name="ItemFileFormat"
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
Grid.Row="1"
HorizontalAlignment="Left"
FontSize="12px"
Expand All @@ -417,6 +422,7 @@
TextWrapping="NoWrap" />

<TextBlock
x:Name="ItemSize"
Grid.Row="2"
HorizontalAlignment="Left"
FontSize="12px"
Expand Down
42 changes: 35 additions & 7 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using Vanara.Extensions.Reflection;
using Windows.Storage;
using Windows.System;
using Windows.UI.Core;
Expand Down Expand Up @@ -183,25 +184,41 @@ override public void StartRenameItem()
{
Popup popup = gridViewItem.FindDescendant("EditPopup") as Popup;
TextBlock textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
Grid gridMain = gridViewItem.FindDescendant("GridViewBrowserListedItem") as Grid;

textBox = popup.Child as TextBox;
textBox.Text = textBlock.Text;
textBlock.Opacity = 0;
popup.IsOpen = true;
OldItemName = textBlock.Text;
gridMain.RowDefinitions[0].Height = new GridLength(0);
}
else
{
TextBlock textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
TextBlock textBlockName = gridViewItem.FindDescendant("ItemName") as TextBlock;
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
TextBlock textBlockFormat = gridViewItem.FindDescendant("ItemFileFormat") as TextBlock;
TextBlock textBlockSize = gridViewItem.FindDescendant("ItemSize") as TextBlock;
textBox = gridViewItem.FindDescendant("TileViewTextBoxItemName") as TextBox;
textBox.Text = textBlock.Text;
OldItemName = textBlock.Text;
textBlock.Visibility = Visibility.Collapsed;
Grid gridMain = gridViewItem.FindDescendant("MainGrid") as Grid;

textBox.Text = textBlockName.Text;
OldItemName = textBlockName.Text;

textBlockName.Visibility = Visibility.Collapsed;
textBlockFormat.Visibility = Visibility.Collapsed;
textBlockSize.Visibility = Visibility.Collapsed;
textBox.Visibility = Visibility.Visible;
gridMain.ColumnDefinitions[0].Width = new GridLength(0);
gridMain.ColumnDefinitions[1].Width = new GridLength(0);

if (textBox.FindParent<Grid>() is null)
{
textBlock.Visibility = Visibility.Visible;
textBlockName.Visibility = Visibility.Visible;
textBlockFormat.Visibility = Visibility.Visible;
textBlockSize.Visibility = Visibility.Visible;
textBox.Visibility = Visibility.Collapsed;
gridMain.ColumnDefinitions[0].Width = GridLength.Auto;
gridMain.ColumnDefinitions[1].Width = new GridLength(64);
return;
}
}
Expand Down Expand Up @@ -242,14 +259,25 @@ protected override void EndRename(TextBox textBox)
{
Popup? popup = gridViewItem.FindDescendant("EditPopup") as Popup;
TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
Grid? gridMain = gridViewItem.FindDescendant("GridViewBrowserListedItem") as Grid;

popup!.IsOpen = false;
textBlock!.Opacity = (textBlock.DataContext as ListedItem)!.Opacity;
gridMain.RowDefinitions[0].Height = GridLength.Auto;
}
else if (FolderSettings.LayoutMode == FolderLayoutModes.TilesView)
{
TextBlock? textBlock = gridViewItem.FindDescendant("ItemName") as TextBlock;
TextBlock? textBlockName = gridViewItem.FindDescendant("ItemName") as TextBlock;
TextBlock? textBlockFormat = gridViewItem.FindDescendant("ItemFileFormat") as TextBlock;
TextBlock? textBlockSize = gridViewItem.FindDescendant("ItemSize") as TextBlock;
Grid? gridMain = gridViewItem.FindDescendant("MainGrid") as Grid;

textBox.Visibility = Visibility.Collapsed;
textBlock!.Visibility = Visibility.Visible;
textBlockName!.Visibility = Visibility.Visible;
textBlockFormat!.Visibility = Visibility.Visible;
textBlockSize!.Visibility = Visibility.Visible;
gridMain.ColumnDefinitions[0].Width = GridLength.Auto;
gridMain.ColumnDefinitions[1].Width = new GridLength(64);
}

textBox!.LostFocus -= RenameTextBox_LostFocus;
Expand Down