keyboard use on edit tab

KaddaOK · Mar 10, 2024 · 8cf46c5 · 8cf46c5
1 parent 8d0c6d7
commit 8cf46c5
Show file tree

Hide file tree

Showing 13 changed files with 904 additions and 388 deletions.
diff --git a/KaddaOK.AvaloniaApp/App.axaml b/KaddaOK.AvaloniaApp/App.axaml
@@ -127,6 +127,7 @@
 	<Application.Resources>
         <local:WaveformToPointConverter x:Key="WaveformToPointConverter" />
         <local:WaveformToLengthConverter x:Key="WaveformToLengthConverter" />
+        <local:ObjectEqualityBooleanConverter x:Key="ObjectEqualityBooleanConverter" />
         <local:RoundingConverter x:Key="RoundingConverter" />
     </Application.Resources>
 </Application>
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml
@@ -11,7 +11,10 @@
              xmlns:models="clr-namespace:KaddaOK.AvaloniaApp.Models"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="KaddaOK.AvaloniaApp.Controls.Dialogs.EditLineTimingDialog"
-             x:DataType="models:EditingLine">
+             x:DataType="models:EditingLine"
+             Focusable="True"
+			 AttachedToVisualTree="UserControl_AttachedToVisualTree"
+             KeyDown="UserControl_KeyDown">
 	<dialogs:ModalDialogChrome Title="Edit Line Timing">
 		<Grid
 		RowDefinitions="50,85,100,85,90,50"

diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditLineTimingDialog.axaml.cs
@@ -37,5 +37,16 @@ private void NewRectanglesItemsControl_PointerReleased(object? sender, PointerRe
         {
             EditLinesViewModel?.EditLineTimingDialogPointerReleased(sender, args);
         }
+
+        private void UserControl_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+        {
+            EditLinesViewModel?.EditLineTimingDialogKeyDown(sender, e);
+            e.Handled = true;
+        }
+
+        private void UserControl_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        {
+            this.Focus();
+        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
@@ -24,11 +24,13 @@
                 and the timing dialog will open automatically for you to check the new distribution.)
             </TextBlock>
             <TextBox
+                AttachedToVisualTree="TextBox_AttachedToVisualTree"
                 Grid.Row="2"
                 Margin="0 8 0 0"
                 HorizontalAlignment="Stretch"
                 x:Name="EditWordTextBox"
-                Text="{Binding Text, Mode=OneWay}" />
+                Text="{Binding Text, Mode=OneWay}"
+                KeyDown="TextBox_KeyDown"/>
             <StackPanel
                 Grid.Row="3"
                 Orientation="Horizontal"

diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml.cs
@@ -1,12 +1,36 @@
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using DialogHostAvalonia;
 
 namespace KaddaOK.AvaloniaApp.Controls.Dialogs
 {
     public partial class EditSyllableTextDialog : UserControl
     {
+        private DialogHost? dialogHost;
+
         public EditSyllableTextDialog()
         {
             InitializeComponent();
         }
+
+        private void TextBox_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+        {
+            (sender as TextBox)?.Focus();
+            dialogHost = this.FindAncestorOfType<DialogHost>();
+        }
+
+        private void TextBox_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                dialogHost?.CloseDialogCommand.Execute(((TextBox)sender).Text);
+            }
+
+            if (e.Key == Key.Escape)
+            {
+                dialogHost?.CloseDialogCommand.Execute(null);
+            }
+        }
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs b/KaddaOK.AvaloniaApp/ObjectEqualityBooleanConverter.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Avalonia.Data.Converters;
+
+namespace KaddaOK.AvaloniaApp
+{
+    public class ObjectEqualityBooleanConverter : IMultiValueConverter
+    {
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (values.Count != 2 || values.Any(v => v == null || v.ToString() == "(unset)")) return null;
+
+            return values[0] == values[1];
+        }
+    }
+}
diff --git a/KaddaOK.AvaloniaApp/ObservableStack.cs b/KaddaOK.AvaloniaApp/ObservableStack.cs
@@ -1,77 +1,37 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Linq;
 
 namespace KaddaOK.AvaloniaApp
 {
-    /// <summary>
-    /// Per https://stackoverflow.com/a/56177896/
-    /// </summary>
-    public class ObservableStack<T> : Stack<T>, INotifyCollectionChanged, INotifyPropertyChanged
+    public class ObservableStack<T> : ObservableCollection<T>
     {
-        #region Constructors
+        public T? Peek => Items.LastOrDefault();
 
-        public ObservableStack() : base() { }
-
-        public ObservableStack(IEnumerable<T> collection) : base(collection) { }
-
-        public ObservableStack(int capacity) : base(capacity) { }
-
-        #endregion
-
-        #region Overrides
-
-        public new virtual T? Pop()
+        public T? Pop()
         {
-            var item = base.Pop();
-            OnCollectionChanged(NotifyCollectionChangedAction.Remove, item);
-
-            return item;
-        }
-
-        public new virtual void Push(T? item)
-        {
-            if (item != null)
+            var popIndex = Items.Count - 1;
+            var itemToPop = Items[popIndex];
+            if (itemToPop != null)
             {
-                base.Push(item);
-                OnCollectionChanged(NotifyCollectionChangedAction.Add, item);
+                RemoveAt(popIndex);
             }
-        }
 
-        public new virtual void Clear()
-        {
-            base.Clear();
-            OnCollectionChanged(NotifyCollectionChangedAction.Reset, default);
+            return itemToPop;
         }
 
-        #endregion
-
-        #region CollectionChanged
-
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedAction action, T? item)
+        public void Push(T? item)
         {
-            CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(
-                action
-                , item
-                , item == null ? -1 : 0)
-            );
-
-            OnPropertyChanged(nameof(Count));
+            Add(item);
         }
 
-        #endregion
-
-        #region PropertyChanged
-
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string proertyName)
+        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(proertyName));
+            base.OnCollectionChanged(e);
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Peek)));
         }
-
-        #endregion
     }
 }
diff --git a/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs b/KaddaOK.AvaloniaApp/ViewModels/DesignTime/DesignTimeEditLinesViewModel.cs
@@ -14,6 +14,10 @@ public class DesignTimeEditLinesViewModel : EditLinesViewModel
     {
         public DesignTimeEditLinesViewModel() : base(DesignTimeKaraokeProcess.Get(), new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
         {
+            UndoStack.Add(new ChosenLinesAction("[]", "did this before this view"));
+            UndoStack.Add(new ChosenLinesAction("[]", "and then I did this"));
+            RedoStack.Add(new ChosenLinesAction("[]", "already undid this first"));
+            RedoStack.Add(new ChosenLinesAction("[]", "then undid this"));
         }
     }
 }