Skip to content

Commit 2561845

Browse files
committed
Do not focus filelist when renaming
1 parent dcd056e commit 2561845

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
163163

164164
private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
165165
{
166-
await Task.Delay(200);
167-
FileList.Focus(FocusState.Programmatic);
166+
if (!IsRenamingItem && !ParentShellPageInstance.NavToolbarViewModel.IsEditModeEnabled)
167+
{
168+
await Task.Delay(200);
169+
FileList.Focus(FocusState.Programmatic);
170+
}
168171
}
169172

170173
private async void ReloadItemIcons()

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
284284

285285
private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
286286
{
287-
await Task.Delay(200);
288-
FileList.Focus(FocusState.Programmatic);
287+
if (!IsRenamingItem && !ParentShellPageInstance.NavToolbarViewModel.IsEditModeEnabled)
288+
{
289+
await Task.Delay(200);
290+
FileList.Focus(FocusState.Programmatic);
291+
}
289292
}
290293

291294
private void FolderSettings_LayoutModeChangeRequested(object sender, LayoutModeEventArgs e)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
171171

172172
private async void SelectionRectangle_SelectionEnded(object sender, EventArgs e)
173173
{
174-
await Task.Delay(200);
175-
FileList.Focus(FocusState.Programmatic);
174+
if (!IsRenamingItem && !ParentShellPageInstance.NavToolbarViewModel.IsEditModeEnabled)
175+
{
176+
await Task.Delay(200);
177+
FileList.Focus(FocusState.Programmatic);
178+
}
176179
}
177180

178181
private void FolderSettings_LayoutModeChangeRequested(object sender, LayoutModeEventArgs e)

0 commit comments

Comments
 (0)