Skip to content

Commit d5880b9

Browse files
hishitetsuhishitetsu
authored
Fix: Fixed Ctrl+A in the rename textbox (#12050)
1 parent 9fcd9f0 commit d5880b9

File tree

3 files changed

+12
-30
lines changed

3 files changed

+12
-30
lines changed

‎src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private void FileList_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
252252

253253
protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
254254
{
255-
if (ParentShellPageInstance is null)
255+
if (ParentShellPageInstance is null || IsRenamingItem)
256256
return;
257257

258258
var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
@@ -266,15 +266,9 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
266266
var hotKey = new HotKey(Keys.A, KeyModifiers.Ctrl);
267267

268268
await commands[hotKey].ExecuteAsync();
269-
270-
return;
271269
}
272-
273-
if (e.Key == VirtualKey.Enter && !e.KeyStatus.IsMenuKeyDown)
270+
else if (e.Key == VirtualKey.Enter && !e.KeyStatus.IsMenuKeyDown)
274271
{
275-
if (IsRenamingItem)
276-
return;
277-
278272
e.Handled = true;
279273

280274
if (IsItemSelected && SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
@@ -287,7 +281,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
287281
}
288282
else if (e.Key == VirtualKey.Space)
289283
{
290-
if (!IsRenamingItem && !ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
284+
if (!ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
291285
e.Handled = true;
292286
}
293287
else if (e.KeyStatus.IsMenuKeyDown && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.Up))
@@ -313,7 +307,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
313307
}
314308
else if (e.Key == VirtualKey.Left) // Left arrow: select parent folder (previous column)
315309
{
316-
if (IsRenamingItem || (ParentShellPageInstance is not null && ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled))
310+
if (ParentShellPageInstance is not null && ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
317311
return;
318312

319313
var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
@@ -324,7 +318,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
324318
}
325319
else if (e.Key == VirtualKey.Right) // Right arrow: switch focus to next column
326320
{
327-
if (IsRenamingItem || (ParentShellPageInstance is not null && ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled))
321+
if (ParentShellPageInstance is not null && ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
328322
return;
329323

330324
var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;

‎src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected override void EndRename(TextBox textBox)
309309

310310
protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
311311
{
312-
if (ParentShellPageInstance is null)
312+
if (ParentShellPageInstance is null || IsRenamingItem)
313313
return;
314314

315315
var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
@@ -326,15 +326,9 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
326326
var hotKey = new HotKey(Keys.A, KeyModifiers.Ctrl);
327327

328328
await commands[hotKey].ExecuteAsync();
329-
330-
return;
331329
}
332-
333-
if (e.Key == VirtualKey.Enter && !e.KeyStatus.IsMenuKeyDown)
330+
else if (e.Key == VirtualKey.Enter && !e.KeyStatus.IsMenuKeyDown)
334331
{
335-
if (IsRenamingItem)
336-
return;
337-
338332
e.Handled = true;
339333

340334
if (ctrlPressed && !shiftPressed)
@@ -358,7 +352,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
358352
}
359353
else if (e.Key == VirtualKey.Space)
360354
{
361-
if (!IsRenamingItem && !ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
355+
if (!ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
362356
e.Handled = true;
363357
}
364358
else if (e.KeyStatus.IsMenuKeyDown && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.Up))
@@ -373,7 +367,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
373367
}
374368
else if (e.Key == VirtualKey.Down)
375369
{
376-
if (!IsRenamingItem && isHeaderFocused && !ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
370+
if (isHeaderFocused && !ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
377371
{
378372
var selectIndex = FileList.SelectedIndex < 0 ? 0 : FileList.SelectedIndex;
379373
if (FileList.ContainerFromIndex(selectIndex) is ListViewItem item)

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ protected override void EndRename(TextBox textBox)
253253

254254
protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
255255
{
256-
if (ParentShellPageInstance is null)
256+
if (ParentShellPageInstance is null || IsRenamingItem)
257257
return;
258258

259259
var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
@@ -269,15 +269,9 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
269269
var hotKey = new HotKey(Keys.A, KeyModifiers.Ctrl);
270270

271271
await commands[hotKey].ExecuteAsync();
272-
273-
return;
274272
}
275-
276-
if (e.Key == VirtualKey.Enter && !isFooterFocused && !e.KeyStatus.IsMenuKeyDown)
273+
else if (e.Key == VirtualKey.Enter && !isFooterFocused && !e.KeyStatus.IsMenuKeyDown)
277274
{
278-
if (IsRenamingItem)
279-
return;
280-
281275
e.Handled = true;
282276

283277
if (ctrlPressed && !shiftPressed)
@@ -301,7 +295,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
301295
}
302296
else if (e.Key == VirtualKey.Space)
303297
{
304-
if (!IsRenamingItem && !ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
298+
if (!ParentShellPageInstance.ToolbarViewModel.IsEditModeEnabled)
305299
e.Handled = true;
306300
}
307301
else if (e.KeyStatus.IsMenuKeyDown && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.Up))

0 commit comments

Comments
 (0)