[Database Editor] Greatly improvement database editor UX

Among many: arrow movements, copy paste, selected row view
funjoker · Oct 8, 2021 · 531b7bc · 531b7bc
1 parent 6bb552d
commit 531b7bc
Show file tree

Hide file tree

Showing 45 changed files with 1,741 additions and 284 deletions.
diff --git a/AvaloniaStyles/Controls/CompletionComboBox.axaml b/AvaloniaStyles/Controls/CompletionComboBox.axaml
@@ -32,10 +32,10 @@
                            IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
                            WindowManagerAddShadowHint="True"
                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                           IsLightDismissEnabled="True"
+                           IsLightDismissEnabled="{TemplateBinding IsLightDismissEnabled}"
                            MaxWidth="700"
                            MaxHeight="600"
-                           PlacementConstraintAdjustment="SlideY"
+                           PlacementConstraintAdjustment="SlideY,SlideX"
                            PlacementMode="Bottom"
                            PlacementGravity="Bottom"
                            PlacementTarget="PART_Button">
@@ -59,4 +59,7 @@
             </ControlTemplate>
         </Setter>
     </Style>
+    <Style Selector="controls1|CompletionComboBox:hideButton ToggleButton">
+        <Setter Property="Opacity" Value="0" />
+    </Style>  
 </Styles>
diff --git a/AvaloniaStyles/Controls/CompletionComboBox.axaml.cs b/AvaloniaStyles/Controls/CompletionComboBox.axaml.cs
@@ -17,6 +17,7 @@
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using AvaloniaStyles.Utils;
+using FuzzySharp;
 using WDE.MVVM.Utils;
 
 namespace AvaloniaStyles.Controls
@@ -87,6 +88,18 @@ public IDataTemplate? ButtonItemTemplate
             set => SetValue(ButtonItemTemplateProperty, value);
         }
 
+        public bool HideButton
+        {
+            get => GetValue(HideButtonProperty);
+            set => SetValue(HideButtonProperty, value);
+        }
+
+        public bool IsLightDismissEnabled
+        {
+            get => GetValue(IsLightDismissEnabledProperty);
+            set => SetValue(IsLightDismissEnabledProperty, value);
+        }
+
         public static readonly StyledProperty<IDataTemplate?> ButtonItemTemplateProperty =
             AvaloniaProperty.Register<CompletionComboBox, IDataTemplate?>(nameof(ButtonItemTemplate));
 
@@ -123,6 +136,14 @@ public IDataTemplate? ButtonItemTemplate
                 (o, v) => o.SelectedItem = v,
                 defaultBindingMode: BindingMode.TwoWay);
 
+        public static readonly StyledProperty<bool> IsLightDismissEnabledProperty =
+            AvaloniaProperty.Register<CompletionComboBox, bool>(nameof (IsLightDismissEnabled), true);
+
+        public static readonly StyledProperty<bool> HideButtonProperty =
+            AvaloniaProperty.Register<CompletionComboBox, bool>(nameof (HideButton));
+
+        public event Action? Closed;
+
         public CompletionComboBox()
         {
             // Default async populator searches in Items (toString) using Fuzzy match or normal match depending on the collection size
@@ -138,7 +159,7 @@ public CompletionComboBox()
                 {
                     if (o.Count < 250)
                     {
-                        return FuzzySharp.Process.ExtractSorted(s, items.Select(item => item.ToString()), cutoff: 51)
+                        return Process.ExtractSorted(s, items.Select(item => item.ToString()), cutoff: 51)
                             .Select(item => o[item.Index]!);   
                     }
 
@@ -165,7 +186,7 @@ protected override void OnTextInput(TextInputEventArgs e)
             if (!e.Handled && e.Text != "\n" && e.Text != "\r")
             {
                 IsDropDownOpen = true;
-                SearchTextBox.RaiseEvent(new TextInputEventArgs()
+                SearchTextBox.RaiseEvent(new TextInputEventArgs
                 {
                     Device = e.Device,
                     Handled = false,
@@ -180,6 +201,10 @@ protected override void OnTextInput(TextInputEventArgs e)
 
         static CompletionComboBox()
         {
+            HideButtonProperty.Changed.AddClassHandler<CompletionComboBox>((box, args) =>
+            {
+                box.PseudoClasses.Set(":hideButton", args.NewValue is true);
+            });
             ItemTemplateProperty.Changed.AddClassHandler<CompletionComboBox>((box, args) =>
             {
                 if (box.ButtonItemTemplate == null)
@@ -308,7 +333,7 @@ private TextBox SearchTextBox
                                     }
                                     else if (args.Key == Key.Tab)
                                     {
-                                        SelectionAdapter.HandleKeyDown(new KeyEventArgs()
+                                        SelectionAdapter.HandleKeyDown(new KeyEventArgs
                                         {
                                             Device = args.Device,
                                             Key = (args.KeyModifiers & KeyModifiers.Shift) != 0 ? Key.Up : Key.Down,
@@ -375,6 +400,7 @@ private void Close()
         {
             IsDropDownOpen = false;
             FocusManager.Instance.Focus(ToggleButton, NavigationMethod.Tab);
+            Closed?.Invoke();
         }
 
         /// Filter logic

diff --git a/AvaloniaStyles/Styles/Windows10/ColorsDark.xaml b/AvaloniaStyles/Styles/Windows10/ColorsDark.xaml
@@ -76,6 +76,9 @@
         <SolidColorBrush x:Key="TabItemHeaderBackgroundSelected" Color="#161617" />
         <SolidColorBrush x:Key="TabItemHeaderBackgroundSelectedPointerOver" Color="#202021" />
         <SolidColorBrush x:Key="TabItemHeaderBackgroundUnselected" Color="#202021" />
+
+        <!-- -->
+        <SolidColorBrush x:Key="GroupingHeaderColor" Color="#2AA0C4" />
     </Styles.Resources>
 
     <Style Selector="GridSplitter">

diff --git a/AvaloniaStyles/Styles/Windows10/ColorsLight.xaml b/AvaloniaStyles/Styles/Windows10/ColorsLight.xaml
@@ -119,5 +119,11 @@
         <SolidColorBrush x:Key="TabItemHeaderBackgroundSelected" Color="White" />
         <SolidColorBrush x:Key="TabItemHeaderBackgroundSelectedPointerOver" Color="White" />
         <SolidColorBrush x:Key="TabItemHeaderBackgroundUnselected" Color="#DDDDE2" />
+
+        <!-- -->
+        <SolidColorBrush x:Key="GroupingHeaderColor" Color="#226E8B" />
     </Styles.Resources>
+    <Style Selector="GridSplitter">
+        <Setter Property="Background" Value="#CCC" />
+    </Style>
 </Styles>
diff --git a/AvaloniaStyles/Styles/Windows10/GroupingListBox.axaml b/AvaloniaStyles/Styles/Windows10/GroupingListBox.axaml
@@ -6,7 +6,7 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Grid VerticalAlignment="Center" DockPanel.Dock="Top" ColumnDefinitions="15,Auto,Auto,*">
-                        <Rectangle Fill="#FF226E8B" Height="1" Margin="0,7,0,0"></Rectangle>
+                        <Rectangle Fill="{DynamicResource GroupingHeaderColor}" Height="1" Margin="0,7,0,0"></Rectangle>
                         <ContentPresenter Content="{TemplateBinding CustomContent}" Grid.Column="1" Padding="3" 
                                           Margin="0,5,0,0" />
                         <ContentPresenter Content="{TemplateBinding GroupName}" 
@@ -16,11 +16,11 @@
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
                                     <Setter Property="FontWeight" Value="Bold" />
-                                    <Setter Property="Foreground" Value="#FF226E8B"/>
+                                    <Setter Property="Foreground" Value="{DynamicResource GroupingHeaderColor}"/>
                                 </Style>
                             </ContentPresenter.Styles>
                         </ContentPresenter>
-                        <Rectangle Grid.Column="3" Fill="#FF226E8B" Height="1" Margin="0,7,0,0"></Rectangle>
+                        <Rectangle Grid.Column="3" Fill="{DynamicResource GroupingHeaderColor}" Height="1" Margin="0,7,0,0"></Rectangle>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>