codestyle

Author: el-ev

src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs

@@ -553,23 +553,30 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
-			if (e.Key is Windows.System.VirtualKey.Down)
+			switch (e.Key)
 			{
-				var item = e.OriginalSource as ListViewItem;
-				var button = item?.FindDescendant<Button>();
-				button?.Flyout.ShowAt(button);
-				e.Handled = true;
-			} else if (e.Key is Windows.System.VirtualKey.Space or Windows.System.VirtualKey.Enter)
-			{
-				var item = e.OriginalSource as ListViewItem;
-				var path = (item?.Content as PathBoxItem)?.Path;
-				if (path == null || path == PathControlDisplayText)
-					return;
-				ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+				case Windows.System.VirtualKey.Down:
 				{
-					ItemPath = path
-				});
-				e.Handled = true;
+					var item = e.OriginalSource as ListViewItem;
+					var button = item?.FindDescendant<Button>();
+					button?.Flyout.ShowAt(button);
+					e.Handled = true;
+					break;
+				}
+				case Windows.System.VirtualKey.Space: 
+				case Windows.System.VirtualKey.Enter:
+				{
+					var item = e.OriginalSource as ListViewItem;
+					var path = (item?.Content as PathBoxItem)?.Path;
+					if (path == PathControlDisplayText)
+						return;
+					ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+					{
+						ItemPath = path
+					});
+					e.Handled = true;
+					break;
+				}
 			}
 		}
 

src/Files.App/Views/MainPage.xaml.cs

@@ -234,19 +234,18 @@ private async Task OnPreviewKeyDownAsync(KeyRoutedEventArgs e)
 				default:
 					var currentModifiers = HotKeyHelpers.GetCurrentKeyModifiers();
 					HotKey hotKey = new((Keys)e.Key, currentModifiers);
-					var source = (DependencyObject)e.OriginalSource;
+					var source = e.OriginalSource as DependencyObject;
 
 					// A textbox takes precedence over certain hotkeys.
-					if (source.FindAscendantOrSelf<TextBox>() is not null)
+					if (source?.FindAscendantOrSelf<TextBox>() is not null)
 						break;
 
 					// Execute command for hotkey
 					var command = Commands[hotKey];
 
-					if (command.Code is CommandCodes.OpenItem && source.FindAscendantOrSelf<PathBreadcrumb>() is not null)
-					{
+					if (command.Code is CommandCodes.OpenItem && source?.FindAscendantOrSelf<PathBreadcrumb>() is not null)
 						break;
-					}
+					
 
 					if (command.Code is not CommandCodes.None && keyReleased)
 					{