Merge branch 'main' into dev/Enter_and_BackSpace_in_Filepanel

anovik · Sep 13, 2024 · e01ad10 · e01ad10
2 parents 58e2394 + f4ad480
commit e01ad10
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 52 deletions.
diff --git a/src/SmartCommander/ViewModels/FilesPaneViewModel.cs b/src/SmartCommander/ViewModels/FilesPaneViewModel.cs
@@ -36,7 +36,9 @@ public class FilesPaneViewModel : ViewModelBase
 
         private bool _isSelected;
         private SortingBy _sorting = SortingBy.SortingByName;
-        private bool _ascending = true;      
+        private bool _ascending = true;
+        public event EventHandler FocusChanged;
+
         public string CurrentDirectory
         {
             get => _currentDirectory;
@@ -88,8 +90,12 @@ public bool IsSelected
             set
             {
                 _isSelected = value;
-                this.RaisePropertyChanged("IsSelected");
                 this.RaisePropertyChanged("GridBorderBrush");
+
+                if (value)
+                {
+                    FocusChanged?.Invoke(this, EventArgs.Empty);
+                }
             }
         }
 
@@ -100,7 +106,9 @@ public bool IsCurrentDirectoryDisplayed
         }
 
 
-        public Brush GridBorderBrush => IsSelected ? new SolidColorBrush(Colors.LightSkyBlue) : new SolidColorBrush(Colors.Transparent);
+        public static Brush SelectedBrush = new SolidColorBrush(Colors.LightSkyBlue);
+        public static Brush NotSelectedBrush = new SolidColorBrush(Colors.Transparent);
+        public Brush GridBorderBrush => IsSelected ? SelectedBrush : NotSelectedBrush;
 
         public ObservableCollection<FileViewModel> FoldersFilesList { get; set; } = new ObservableCollection<FileViewModel>();
 

diff --git a/src/SmartCommander/ViewModels/MainWindowViewModel.cs b/src/SmartCommander/ViewModels/MainWindowViewModel.cs
@@ -36,11 +36,13 @@ public MainWindowViewModel()
             F6Command = ReactiveCommand.CreateFromTask(Move);
             F7Command = ReactiveCommand.Create(CreateNewFolder);
             F8Command = ReactiveCommand.Create(Delete);
-            TabCommand = ReactiveCommand.Create(ChangeSelectedPane);
             OptionsCommand = ReactiveCommand.CreateFromTask(ShowOptions);
 
-            LeftFileViewModel = new FilesPaneViewModel(this) { IsSelected = true };
+            LeftFileViewModel = new FilesPaneViewModel(this);
+            LeftFileViewModel.FocusChanged += OnFocusChanged;
+
             RightFileViewModel = new FilesPaneViewModel(this);
+            RightFileViewModel.FocusChanged += OnFocusChanged;
 
             if (!string.IsNullOrEmpty(OptionsModel.Instance.LeftPanePath))
             {
@@ -53,6 +55,13 @@ public MainWindowViewModel()
             SetTheme();
             _progress = new Progress<int>(v => Progress_Show(v));
         }
+        private void OnFocusChanged(object? sender, EventArgs e)
+        {
+            if (sender is FilesPaneViewModel)
+            {
+                SelectedPane = (FilesPaneViewModel)sender;
+            }
+        }
 
         public ReactiveCommand<Unit, Unit> ExitCommand { get; }
 
@@ -136,63 +145,23 @@ public void SortDate()
             SelectedPane.Ascending = true;
         }
 
-        public void ChangeSelectedPane()
-        {
-            if (LeftFileViewModel.IsSelected)
-            {
-                SelectedPane = RightFileViewModel;
-            }
-            else if (RightFileViewModel.IsSelected)
-            {
-                SelectedPane = LeftFileViewModel;
-            }
-        }
-
         public FilesPaneViewModel SecondPane
         {
             get
             {
-                if (LeftFileViewModel.IsSelected)
-                {
-                    return RightFileViewModel;
-                }
-                else if (RightFileViewModel.IsSelected)
+                if (SelectedPane == RightFileViewModel)
                 {
                     return LeftFileViewModel;
                 }
-                throw new Exception(Resources.ErrorNoPane);
-            }
-        }
-
-        public FilesPaneViewModel SelectedPane
-        {
-            get
-            {
-                if (LeftFileViewModel.IsSelected)
-                {
-                    return LeftFileViewModel;
-                }
-                else if (RightFileViewModel.IsSelected)
+                else
                 {
                     return RightFileViewModel;
                 }
-                throw new Exception(Resources.ErrorNoPane);
-            }
-            set
-            {
-                if (RightFileViewModel == value && !RightFileViewModel.IsSelected)
-                {
-                    LeftFileViewModel.IsSelected = false;
-                    RightFileViewModel.IsSelected = true;
-                }
-                else if (LeftFileViewModel == value && !LeftFileViewModel.IsSelected)
-                {
-                    RightFileViewModel.IsSelected = false;
-                    LeftFileViewModel.IsSelected = true;
-                }
             }
         }
 
+        public FilesPaneViewModel SelectedPane { get; set; }
+
         public void Execute()
         {
             SelectedPane.Execute(CommandText);

diff --git a/src/SmartCommander/Views/FilesPane.axaml b/src/SmartCommander/Views/FilesPane.axaml
@@ -37,10 +37,13 @@
       </Grid.ColumnDefinitions>
 			<TextBox IsTabStop="False" Text="{Binding CurrentDirectory}" >      
 			</TextBox>
-      <ComboBox Grid.Column="1" IsVisible="{Binding IsWindows}" Name="driveCombo" SelectedItem="{Binding SelectedDrive, Mode=TwoWay}">      
+      <ComboBox Grid.Column="1" IsVisible="{Binding IsWindows}" Name="driveCombo" SelectedItem="{Binding SelectedDrive, Mode=TwoWay}" IsTabStop="False">      
       </ComboBox>
     </Grid>	
-	    <DataGrid Margin="5" Grid.Row="1" IsTabStop="True"				
+	    <DataGrid Name="PaneDataGrid" Loaded="OnLoaded"
+				  IsFocused="{Binding IsSelected, Mode=OneWayToSource}"
+
+				  Margin="5" Grid.Row="1" IsTabStop="True"				
 				  ItemsSource="{Binding FoldersFilesList}" 
 				  AutoGenerateColumns="False"
 				  CanUserResizeColumns="True" 

diff --git a/src/SmartCommander/Views/FilesPane.axaml.cs b/src/SmartCommander/Views/FilesPane.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using System;
 using System.IO;
@@ -22,6 +23,13 @@ public FilesPane()
                     comboBox.SelectedIndex = 0;
                 }
             }
+
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            var PaneDataGrid = this.Get<DataGrid>("PaneDataGrid");
+            PaneDataGrid.Focus();
         }
 
         private void InitializeComponent()

diff --git a/src/SmartCommander/Views/MainWindow.axaml b/src/SmartCommander/Views/MainWindow.axaml
@@ -17,7 +17,6 @@
     </Design.DataContext>
 
 	<Window.KeyBindings>
-		<KeyBinding Gesture="Tab" Command="{Binding TabCommand}" />
 		<KeyBinding Gesture="F3" Command="{Binding F3Command}" />
 		<KeyBinding Gesture="F4" Command="{Binding F4Command}" />
 		<KeyBinding Gesture="F5" Command="{Binding F5Command}" />