From 712d3f243a1e2697e00605383ec5d486a39dd3f1 Mon Sep 17 00:00:00 2001
From: CascadePass <106619481+CascadePass@users.noreply.github.com>
Date: Thu, 12 Jun 2025 23:18:41 -0700
Subject: [PATCH] Make Settings Available Immediately

Improve CommandTextBox to allow multiple buttons instead of only one, and use this ability to make settings available before an image is loaded.
---
 src/Glazier.UI/CommandTextBox.xaml    |  8 +++-
 src/Glazier.UI/CommandTextBox.xaml.cs | 55 ++++++++++++++++++++++++++-
 src/Glazier.UI/LoadImageForm.xaml     | 27 +++++++++++--
 src/Glazier.UI/WorkspaceViewModel.cs  | 10 ++++-
 4 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/src/Glazier.UI/CommandTextBox.xaml b/src/Glazier.UI/CommandTextBox.xaml
index b621cc0..fc72422 100644
--- a/src/Glazier.UI/CommandTextBox.xaml
+++ b/src/Glazier.UI/CommandTextBox.xaml
@@ -7,18 +7,24 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
-    <Border Style="{DynamicResource CommandTextBoxBorder}">
+    <Border Style="{DynamicResource CommandTextBoxBorder}" AutomationProperties.Name="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=InsetText, Mode=OneWay}">
         <DockPanel LastChildFill="True">
             <Button
                 x:Name="SearchButton"
                 DockPanel.Dock="Right"
                 Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=Command, Mode=OneWay}"
+                ToolTip="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=InsetText, Mode=OneWay}"
+                AutomationProperties.Name="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=InsetText, Mode=OneWay}"
+                Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=IsSingleButton, Mode=OneWay, Converter={StaticResource boolToVisibility}}"
                 BorderBrush="Transparent"
                 Background="Transparent"
                 >
                 <Image Source="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=CommandIcon, Mode=OneWay}" Style="{DynamicResource Icon}" />
             </Button>
 
+            <ContentPresenter x:Name="ButtonsPresenter" DockPanel.Dock="Right" />
+
+
             <Grid>
                 <TextBlock x:Name="InsetLabel" Style="{DynamicResource CommandTextBoxInsetLabelStyle}">                    
                     <Image
diff --git a/src/Glazier.UI/CommandTextBox.xaml.cs b/src/Glazier.UI/CommandTextBox.xaml.cs
index 8950a64..1ff526c 100644
--- a/src/Glazier.UI/CommandTextBox.xaml.cs
+++ b/src/Glazier.UI/CommandTextBox.xaml.cs
@@ -1,4 +1,7 @@
-using System.Windows;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
@@ -33,17 +36,22 @@ public partial class CommandTextBox : UserControl
                 typeof(string), typeof(CommandTextBox), new PropertyMetadata(string.Empty)
             );
 
-
         public static readonly DependencyProperty CommandProperty =
             DependencyProperty.Register("Command",
                 typeof(ICommand), typeof(CommandTextBox), new PropertyMetadata(null)
             );
 
+        public static readonly DependencyProperty ButtonsProperty =
+            DependencyProperty.Register("Buttons",
+                typeof(ObservableCollection<Button>), typeof(CommandTextBox), new PropertyMetadata(null)
+            );
+
         #endregion
 
         public CommandTextBox()
         {
             this.InitializeComponent();
+            this.Buttons = [];
         }
 
         #region Dependency Properties (Getters/Setters)
@@ -78,6 +86,49 @@ public ICommand Command
             set { SetValue(CommandProperty, value); }
         }
 
+        public ObservableCollection<Button> Buttons
+        {
+            get { return (ObservableCollection<Button>)GetValue(ButtonsProperty); }
+            set
+            {
+                if (this.Buttons != null)
+                {
+                    this.Buttons.CollectionChanged -= this.Buttons_CollectionChanged;
+                }
+
+                SetValue(ButtonsProperty, value);
+
+                if (value != null)
+                {
+                    value.CollectionChanged += this.Buttons_CollectionChanged;
+                }
+
+                this.UpdateContentPresenter();
+            }
+        }
+
+        public bool IsSingleButton => this.Buttons is null || this.Buttons.Count == 0;
+
+        private void Buttons_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            this.UpdateContentPresenter();
+        }
+
+        private void UpdateContentPresenter()
+        {
+            var panel = new StackPanel { Orientation = Orientation.Horizontal };
+
+            foreach (var button in Buttons)
+            {
+                var parent = LogicalTreeHelper.GetParent(button) as Panel;
+                parent?.Children.Remove(button);
+                panel.Children.Add(button);
+            }
+
+            this.ButtonsPresenter.Content = panel;
+            this.ButtonsPresenter.UpdateLayout();
+        }
+
         #endregion
     }
 }
diff --git a/src/Glazier.UI/LoadImageForm.xaml b/src/Glazier.UI/LoadImageForm.xaml
index 947f2b5..eb1227d 100644
--- a/src/Glazier.UI/LoadImageForm.xaml
+++ b/src/Glazier.UI/LoadImageForm.xaml
@@ -15,12 +15,31 @@
                 Margin="0,4,0,0"
                 InsetText="{x:Static local:Resources.Label_SourceFile}"
                 InsetIcon="/Images/Icons/FolderOpenBlue.png"
-                CommandIcon="/Images/Icons/FolderOpened.png"
-                Command="{Binding BrowseForImageFileCommand}"
                 Opacity=".7"
                 UserText="{Binding SourceFilename}"
-                Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}"
-                />
+                Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}">
+                <local:CommandTextBox.Buttons>
+                    <Button
+                        Command="{Binding EditSettingsCommand, Mode=OneWay}"
+                        ToolTip="{x:Static local:Resources.Settings}"
+                        AutomationProperties.Name="{x:Static local:Resources.Settings}"
+                        BorderBrush="Transparent"
+                        Background="Transparent"
+                        >
+                        <Image Source="/Images/Icons/Settings.png" Style="{DynamicResource Icon}" />
+                    </Button>
+
+                    <Button
+                        Command="{Binding BrowseForImageFileCommand, Mode=OneWay}"
+                        ToolTip="{x:Static local:Resources.Label_SourceFile}"
+                        AutomationProperties.Name="{x:Static local:Resources.Label_SourceFile}"
+                        BorderBrush="Transparent"
+                        Background="Transparent"
+                        >
+                        <Image Source="/Images/Icons/FolderOpened.png"  Style="{DynamicResource Icon}" />
+                    </Button>
+                </local:CommandTextBox.Buttons>
+            </local:CommandTextBox>
 
 
             <Border Background="{DynamicResource AlgorithmSelectorButtonBackgroundBrush}" Margin="0,40,0,4" CornerRadius="12">
diff --git a/src/Glazier.UI/WorkspaceViewModel.cs b/src/Glazier.UI/WorkspaceViewModel.cs
index 60c7169..e2dec17 100644
--- a/src/Glazier.UI/WorkspaceViewModel.cs
+++ b/src/Glazier.UI/WorkspaceViewModel.cs
@@ -35,7 +35,7 @@ public class WorkspaceViewModel : ViewModel
         private IThemeListener themeListener;
         private IFileDialogProvider dialogProvider;
 
-        private DelegateCommand browseForImageFile, saveImageData, viewLargePreviewCommand, viewMaskCommand;
+        private DelegateCommand browseForImageFile, saveImageData, viewLargePreviewCommand, viewMaskCommand, editSettingsCommand;
 
         #endregion
 
@@ -299,6 +299,8 @@ public bool IsMaskVisible
 
         public ICommand ViewMaskCommand => this.viewMaskCommand ??= new(this.ViewMaskImplementation);
 
+        public ICommand EditSettingsCommand => this.editSettingsCommand ??= new(this.EditSettingsImplementation);
+
         #endregion
 
 
@@ -511,6 +513,12 @@ internal void ViewLargePreviewImplementation()
             previewWindow.ShowDialog();
         }
 
+        internal void EditSettingsImplementation()
+        {
+            this.IsSettingsPageVisible = true;
+            this.SettingsViewModel.IsSettingsPageOpen = true;
+        }
+
         #endregion
 
         #region Event Handlers