Skip to content

Commit e699407

Browse files
author
Richard
authored
fixed auto selection when renaming if extensions are hidden (#938)
1 parent db79553 commit e699407

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

Files/UserControls/LayoutModes/GenericFileBrowser.xaml.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,13 @@ private void AllView_PreparingCellForEdit(object sender, DataGridPreparingCellFo
260260

261261
renamingTextBox = e.EditingElement as TextBox;
262262
renamingTextBox.Focus(FocusState.Programmatic); // Without this, cannot edit text box when renaming via right-click
263-
renamingTextBox.Select(0, SelectedItem.ItemName.Length - extensionLength);
263+
264+
int selectedTextLength = SelectedItem.ItemName.Length;
265+
if (App.AppSettings.ShowFileExtensions)
266+
{
267+
selectedTextLength -= extensionLength;
268+
}
269+
renamingTextBox.Select(0, selectedTextLength);
264270
renamingTextBox.TextChanged += TextBox_TextChanged;
265271
isRenamingItem = true;
266272
}

Files/UserControls/LayoutModes/GridViewBrowser.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,13 @@ public override void StartRenameItem()
170170
textBox.Focus(FocusState.Pointer);
171171
textBox.LostFocus += RenameTextBox_LostFocus;
172172
textBox.KeyDown += RenameTextBox_KeyDown;
173-
textBox.Select(0, renamingItem.ItemName.Length - extensionLength);
174173

174+
int selectedTextLength = SelectedItem.ItemName.Length;
175+
if (App.AppSettings.ShowFileExtensions)
176+
{
177+
selectedTextLength -= extensionLength;
178+
}
179+
textBox.Select(0, selectedTextLength);
175180
isRenamingItem = true;
176181
}
177182

0 commit comments

Comments
 (0)