Skip to content

Commit 9ca0cda

Browse files
committed
Cleanup
1 parent 12996dd commit 9ca0cda

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

src/Files.App/UserControls/SearchBox.xaml.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ public SearchBoxViewModel SearchBoxViewModel
2020

2121
private void SearchRegion_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs e)
2222
=> SearchBoxViewModel.SearchRegion_TextChanged(sender, e);
23+
2324
private void SearchRegion_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs e)
2425
=> SearchBoxViewModel.SearchRegion_QuerySubmitted(sender, e);
26+
2527
private void SearchRegion_Escaped(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs e)
2628
=> SearchBoxViewModel.SearchRegion_Escaped(sender, e);
29+
2730
private void SearchRegion_KeyDown(object sender, KeyRoutedEventArgs e)
2831
=> SearchBoxViewModel.SearchRegion_KeyDown(sender, e);
2932
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object?
9292
protected override void ItemManipulationModel_AddSelectedItemInvoked(object? sender, ListedItem e)
9393
{
9494
if (NextRenameIndex != 0 && TryStartRenameNextItem(e))
95-
return;
95+
return;
96+
9697
FileList?.SelectedItems.Add(e);
9798
}
9899

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ protected override void ItemManipulationModel_AddSelectedItemInvoked(object? sen
8080
{
8181
if ((NextRenameIndex != 0 && TryStartRenameNextItem(e)) || (!FileList?.Items.Contains(e) ?? true))
8282
return;
83+
8384
FileList!.SelectedItems.Add(e);
8485
}
8586

src/Files.App/Views/LayoutModes/StandardLayoutMode.cs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ protected virtual void ZoomIn(object? sender, GroupOption option)
136136
protected virtual async void FileList_SelectionChanged(object sender, SelectionChangedEventArgs e)
137137
{
138138
SelectedItems = ListViewBase.SelectedItems.Cast<ListedItem>().Where(x => x is not null).ToList();
139+
139140
if (SelectedItems.Count == 1 && App.AppModel.IsQuickLookAvailable)
140141
await QuickLookHelpers.ToggleQuickLook(ParentShellPageInstance, true);
141142
}
@@ -173,8 +174,10 @@ protected virtual void StartRenameItem(string itemNameTextBox)
173174
textBox.KeyDown += RenameTextBox_KeyDown;
174175

175176
int selectedTextLength = SelectedItem.Name.Length;
177+
176178
if (!SelectedItem.IsShortcut && UserSettingsService.FoldersSettingsService.ShowFileExtensions)
177179
selectedTextLength -= extensionLength;
180+
178181
textBox.Select(0, selectedTextLength);
179182
IsRenamingItem = true;
180183
}
@@ -235,13 +238,20 @@ protected async void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
235238
NextRenameIndex = isShiftPressed ? -1 : 1;
236239

237240
if (textBox.Text != OldItemName)
241+
{
238242
await CommitRename(textBox);
243+
}
239244
else
240245
{
241246
var newIndex = ListViewBase.SelectedIndex + NextRenameIndex;
242247
NextRenameIndex = 0;
243248
EndRename(textBox);
244-
if (newIndex >= 0 && newIndex < ListViewBase.Items.Count)
249+
250+
if
251+
(
252+
newIndex >= 0 &&
253+
newIndex < ListViewBase.Items.Count
254+
)
245255
{
246256
ListViewBase.SelectedIndex = newIndex;
247257
StartRenameItem();
@@ -257,12 +267,19 @@ protected bool TryStartRenameNextItem(ListedItem item)
257267
{
258268
var nextItemIndex = ListViewBase.Items.IndexOf(item) + NextRenameIndex;
259269
NextRenameIndex = 0;
260-
if (nextItemIndex >= 0 && nextItemIndex < ListViewBase.Items.Count)
270+
271+
if
272+
(
273+
nextItemIndex >= 0 &&
274+
nextItemIndex < ListViewBase.Items.Count
275+
)
261276
{
262277
ListViewBase.SelectedIndex = nextItemIndex;
263278
StartRenameItem();
279+
264280
return true;
265281
}
282+
266283
return false;
267284
}
268285

0 commit comments

Comments
 (0)