Skip to content

Commit 50ced69

Browse files
committed
Change file jumping to use all chars from just A-Z
1 parent e4c425a commit 50ced69

File tree

4 files changed

+16
-22
lines changed

4 files changed

+16
-22
lines changed

Files UWP/Filesystem/ItemViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public string JumpString
187187
ListedItem jumpedToItem = null;
188188
try
189189
{
190-
jumpedToItem = _filesAndFolders.Where(f => f.FileName.Substring(0, value.Length).ToUpper() == value).First();
190+
jumpedToItem = _filesAndFolders.Where(f => f.FileName.Substring(0, value.Length).ToLower() == value).First();
191191
}
192192
catch (ArgumentOutOfRangeException) { }
193193
catch (InvalidOperationException) { }

Files UWP/GenericFileBrowser.xaml.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
256256
}
257257

258258
// Add item jumping handler
259-
Window.Current.CoreWindow.KeyDown += Page_KeyDown;
259+
Window.Current.CoreWindow.CharacterReceived += Page_CharacterReceived;
260260
}
261261

262262
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -270,7 +270,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
270270
//this.Bindings.StopTracking();
271271

272272
// Remove item jumping handler
273-
Window.Current.CoreWindow.KeyDown -= Page_KeyDown;
273+
Window.Current.CoreWindow.CharacterReceived -= Page_CharacterReceived;
274274
}
275275

276276
private void AllView_DragOver(object sender, DragEventArgs e)
@@ -430,18 +430,15 @@ private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
430430
}
431431
}
432432

433-
private void Page_KeyDown(object sender, KeyEventArgs e)
433+
private void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
434434
{
435435
var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
436436
if (focusedElement is TextBox)
437437
return;
438-
if (e.VirtualKey >= VirtualKey.A && e.VirtualKey <= VirtualKey.Z)
439-
{
440-
char letterPressed = Convert.ToChar(e.VirtualKey);
441-
AllView.Focus(FocusState.Keyboard);
442-
tabInstance.instanceInteraction.PushJumpChar(letterPressed);
443-
e.Handled = true;
444-
}
438+
439+
char letterPressed = Convert.ToChar(args.KeyCode);
440+
AllView.Focus(FocusState.Keyboard);
441+
tabInstance.instanceInteraction.PushJumpChar(letterPressed);
445442
}
446443
}
447444

Files UWP/Interacts/Interaction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ public void ClearAllItems()
928928

929929
public void PushJumpChar(char letter)
930930
{
931-
tabInstance.instanceViewModel.JumpString += letter;
931+
tabInstance.instanceViewModel.JumpString += letter.ToString().ToLower();
932932
}
933933
}
934934
}

Files UWP/PhotoAlbum.xaml.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
148148
}
149149

150150
// Add item jumping handler
151-
Window.Current.CoreWindow.KeyDown += Page_KeyDown;
151+
Window.Current.CoreWindow.CharacterReceived += Page_CharacterReceived;
152152
}
153153

154154
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -160,7 +160,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
160160
}
161161

162162
// Remove item jumping handler
163-
Window.Current.CoreWindow.KeyDown -= Page_KeyDown;
163+
Window.Current.CoreWindow.CharacterReceived -= Page_CharacterReceived;
164164
}
165165

166166
private void Clipboard_ContentChanged(object sender, object e)
@@ -401,18 +401,15 @@ private void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
401401
}
402402
}
403403

404-
private void Page_KeyDown(object sender, KeyEventArgs e)
404+
private void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
405405
{
406406
var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
407407
if (focusedElement is TextBox)
408408
return;
409-
if (e.VirtualKey >= VirtualKey.A && e.VirtualKey <= VirtualKey.Z)
410-
{
411-
char letterPressed = Convert.ToChar(e.VirtualKey);
412-
gv.Focus(FocusState.Keyboard);
413-
tabInstance.instanceInteraction.PushJumpChar(letterPressed);
414-
e.Handled = true;
415-
}
409+
410+
char letterPressed = Convert.ToChar(args.KeyCode);
411+
gv.Focus(FocusState.Keyboard);
412+
tabInstance.instanceInteraction.PushJumpChar(letterPressed);
416413
}
417414
}
418415
}

0 commit comments

Comments
 (0)