Merge pull request #87 from Diaskhan/dev/Enter_and_BackSpace_in_Filep…

…anel fix Enter and Backspace Bahiouvr
anovik · Sep 13, 2024 · 3c636fe · 3c636fe
2 parents f4ad480 + e01ad10
commit 3c636fe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/SmartCommander/ViewModels/FilesPaneViewModel.cs b/src/SmartCommander/ViewModels/FilesPaneViewModel.cs
@@ -125,11 +125,14 @@ public FilesPaneViewModel(MainWindowViewModel mainVM)
             EditCommand = ReactiveCommand.Create(Edit);
             ZipCommand = ReactiveCommand.Create(Zip);
             UnzipCommand = ReactiveCommand.Create(Unzip);
+            FilesPaneEnterCommand = ReactiveCommand.Create(() => ProcessCurrentItem());
+            FilesPaneBackspaceCommand = ReactiveCommand.Create(() => ProcessCurrentItem(true));
             ShowViewerDialog = new Interaction<ViewerViewModel, ViewerViewModel?>();
             _mainVM = mainVM;
         }
 
-        public ReactiveCommand<Unit, Unit>? EnterCommand { get; }
+        public ReactiveCommand<Unit, Unit>? FilesPaneEnterCommand { get; }
+        public ReactiveCommand<Unit, Unit>? FilesPaneBackspaceCommand { get; }
         public ReactiveCommand<Unit, Unit>? ViewCommand { get; }
         public ReactiveCommand<Unit, Unit>? EditCommand { get; }
         public ReactiveCommand<Unit, Unit>? ZipCommand { get; }
@@ -377,12 +380,20 @@ public void CreateNewFolder(string name)
             Directory.CreateDirectory(newFolder);
         }
 
-        private void ProcessCurrentItem()
+        private void ProcessCurrentItem(bool goToParent = false)
         {       
             if (CurrentItem == null)
             {
                 return;
             }
+
+            if (goToParent)
+            {
+                CurrentDirectory = Directory.GetParent(CurrentDirectory) != null ? Directory.GetParent(CurrentDirectory)!.FullName :
+                        CurrentDirectory;
+                return;
+            }
+
             if (CurrentItem.IsFolder)
             {
                 if (CurrentItem.FullName == "..")

diff --git a/src/SmartCommander/Views/FilesPane.axaml b/src/SmartCommander/Views/FilesPane.axaml
@@ -61,6 +61,10 @@
 					<Setter Property="IsVisible" Value="False" />
 				</Style>
 			</DataGrid.Styles>
+			<DataGrid.KeyBindings>
+				<KeyBinding Gesture="Enter" Command="{Binding FilesPaneEnterCommand}" />
+				<KeyBinding Gesture="Back" Command="{Binding FilesPaneBackspaceCommand}"/>
+			</DataGrid.KeyBindings>
         <DataGrid.ContextFlyout>
 			<MenuFlyout>
 				<MenuItem Header="{x:Static assets:Resources.View}" Command="{Binding ViewCommand}"></MenuItem>