File tree Expand file tree Collapse file tree 3 files changed +15
-6
lines changed
src/Files/Views/LayoutModes Expand file tree Collapse file tree 3 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -163,8 +163,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
163
163
164
164
private async void SelectionRectangle_SelectionEnded ( object sender , EventArgs e )
165
165
{
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
+ }
168
171
}
169
172
170
173
private async void ReloadItemIcons ( )
Original file line number Diff line number Diff line change @@ -284,8 +284,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
284
284
285
285
private async void SelectionRectangle_SelectionEnded ( object sender , EventArgs e )
286
286
{
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
+ }
289
292
}
290
293
291
294
private void FolderSettings_LayoutModeChangeRequested ( object sender , LayoutModeEventArgs e )
Original file line number Diff line number Diff line change @@ -171,8 +171,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
171
171
172
172
private async void SelectionRectangle_SelectionEnded ( object sender , EventArgs e )
173
173
{
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
+ }
176
179
}
177
180
178
181
private void FolderSettings_LayoutModeChangeRequested ( object sender , LayoutModeEventArgs e )
You can’t perform that action at this time.
0 commit comments