From 1890fcb76e600f893a2179e7460813fd2c2277c0 Mon Sep 17 00:00:00 2001
From: CascadePass <106619481+CascadePass@users.noreply.github.com>
Date: Tue, 10 Jun 2025 22:13:30 -0700
Subject: [PATCH] Remove form labels

---
 src/Glazier.UI/LoadImageForm.xaml       | 166 +++++++++++-------------
 src/Glazier.UI/LoadImageForm.xaml.cs    |   4 +
 src/Glazier.UI/Themes/Dark.xaml         |   2 +-
 src/Glazier.UI/Themes/HighContrast.xaml |   2 +-
 src/Glazier.UI/Themes/Light.xaml        |   2 +-
 src/Glazier.UI/Themes/Universal.xaml    |   1 +
 6 files changed, 84 insertions(+), 93 deletions(-)

diff --git a/src/Glazier.UI/LoadImageForm.xaml b/src/Glazier.UI/LoadImageForm.xaml
index f077f3e..947f2b5 100644
--- a/src/Glazier.UI/LoadImageForm.xaml
+++ b/src/Glazier.UI/LoadImageForm.xaml
@@ -10,13 +10,6 @@
         x:Name="InputFormBorder"
         Style="{DynamicResource OuterBorderStyle}">
         <StackPanel>
-            <TextBlock
-                x:Name="InputFileLabel"
-                Text="{x:Static local:Resources.Label_SourceFile}"
-                Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}"
-                Style="{DynamicResource FormLabel}"
-                />
-
             <local:CommandTextBox
                 x:Name="InputFile"
                 Margin="0,4,0,0"
@@ -30,97 +23,90 @@
                 />
 
 
-            <TextBlock
-                x:Name="AlgorithmLabel"
-                Margin="0,12,0,0"
-                Text="{x:Static local:Resources.Algorithm}"
-                Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}"
-                Style="{DynamicResource FormLabel}"
-                />
-
-            <Border Background="{DynamicResource AlgorithmSelectorButtonBackgroundBrush}" Margin="0,4,0,4" CornerRadius="12">
+            <Border Background="{DynamicResource AlgorithmSelectorButtonBackgroundBrush}" Margin="0,40,0,4" CornerRadius="12">
                 <Grid>
-                <!-- Selection Indicator -->
-                <Border
-                    x:Name="SelectionHighlight"
-                    CornerRadius="8"
-                    Background="{DynamicResource AlgorithmSelectorCheckedButtonBackgroundBrush}"
-                    RenderTransformOrigin="0.5,0.5">
-                    <Border.RenderTransform>
-                        <TranslateTransform x:Name="HighlightTransform"/>
-                    </Border.RenderTransform>
-                </Border>
+                    <!-- Selection Indicator -->
+                    <Border
+                        x:Name="SelectionHighlight"
+                        CornerRadius="8"
+                        Background="{DynamicResource AlgorithmSelectorCheckedButtonBackgroundBrush}"
+                        RenderTransformOrigin="0.5,0.5">
+                        <Border.RenderTransform>
+                            <TranslateTransform x:Name="HighlightTransform"/>
+                        </Border.RenderTransform>
+                    </Border>
 
-                <ItemsControl x:Name="GlazeMethodSelector" ItemsSource="{Binding AvailableGlazeMethods}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <RadioButton
-                                IsEnabled="{Binding IsEnabled}"
-                                IsChecked="{Binding IsSelected, Mode=TwoWay}"
-                                Style="{StaticResource SegmentedRadioButtonStyle}"
-                                HorizontalAlignment="Left"
-                                GroupName="GlazeMethodSelectionRadioGroup"
-                                Checked="RadioButton_Checked"
-                                Loaded="RadioButton_Loaded">
+                    <ItemsControl x:Name="GlazeMethodSelector" ItemsSource="{Binding AvailableGlazeMethods}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <RadioButton
+                                    AutomationProperties.Name="{Binding Name}"
+                                    IsEnabled="{Binding IsEnabled}"
+                                    IsChecked="{Binding IsSelected, Mode=TwoWay}"
+                                    Style="{StaticResource SegmentedRadioButtonStyle}"
+                                    HorizontalAlignment="Left"
+                                    GroupName="GlazeMethodSelectionRadioGroup"
+                                    Checked="RadioButton_Checked"
+                                    Loaded="RadioButton_Loaded">
 
-                                <DockPanel HorizontalAlignment="Left">
-                                    <Image
-                                        DockPanel.Dock="Left"
-                                        Source="{Binding IconPath}"
-                                        HorizontalAlignment="Left"
-                                        Style="{DynamicResource Icon}" Height="64" Width="64" />
+                                    <DockPanel HorizontalAlignment="Left">
+                                        <Image
+                                            DockPanel.Dock="Left"
+                                            Source="{Binding IconPath}"
+                                            HorizontalAlignment="Left"
+                                            Style="{DynamicResource Icon}" Height="64" Width="64" />
 
-                                    <Grid Margin="8,0,0,0">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
+                                        <Grid Margin="8,0,0,0">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
 
-                                        <TextBlock
-                                            Grid.Row="0"                                        
-                                            FontSize="{DynamicResource FontSize.Large}"
-                                            FontWeight="Bold"
-                                            Margin="0,0,0,4"
-                                            Text="{Binding Name}" />
+                                            <TextBlock
+                                                Grid.Row="0"                                        
+                                                FontSize="{DynamicResource FontSize.Large}"
+                                                FontWeight="Bold"
+                                                Margin="0,0,0,4"
+                                                Text="{Binding Name}" />
 
-                                        <TextBlock
-                                            Grid.Row="1"
-                                            FontSize="{DynamicResource FontSize.Medium}"
-                                            TextWrapping="Wrap">
-                                            <Run Text="{Binding MethodDescription}" />
-                                            <Run Text="{Binding Description}" FontStyle="Italic" />
-                                        </TextBlock>
+                                            <TextBlock
+                                                Grid.Row="1"
+                                                FontSize="{DynamicResource FontSize.Medium}"
+                                                TextWrapping="Wrap">
+                                                <Run Text="{Binding MethodDescription}" />
+                                                <Run Text="{Binding Description}" FontStyle="Italic" />
+                                            </TextBlock>
 
-                                        <TextBlock
-                                            Grid.Row="2"
-                                            FontStyle="Italic"
-                                            Visibility="{Binding ModelPath, Converter={StaticResource nullOrWhitespaceToVisibility}}">
-                                            <Run Text="Model:" />
-                                            <Hyperlink>
-                                                <Run Text="{Binding ModelPath}" />
-                                            </Hyperlink>
-                                        </TextBlock>
+                                            <TextBlock
+                                                Grid.Row="2"
+                                                FontStyle="Italic"
+                                                Visibility="{Binding ModelPath, Converter={StaticResource nullOrWhitespaceToVisibility}}">
+                                                <Run Text="Model:" />
+                                                <Hyperlink>
+                                                    <Run Text="{Binding ModelPath}" />
+                                                </Hyperlink>
+                                            </TextBlock>
 
-                                        <TextBlock
-                                            Grid.Row="3"
-                                            FontWeight="Bold"
-                                            Text="{Binding CurrentStatus}"
-                                            Visibility="{Binding CurrentStatus, Converter={StaticResource nullOrWhitespaceToVisibility}}"
-                                            Margin="0,4,0,0" />
-                                    </Grid>
-                                </DockPanel>
-                            </RadioButton>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </Grid>
+                                            <TextBlock
+                                                Grid.Row="3"
+                                                FontWeight="Bold"
+                                                Text="{Binding CurrentStatus}"
+                                                Visibility="{Binding CurrentStatus, Converter={StaticResource nullOrWhitespaceToVisibility}}"
+                                                Margin="0,4,0,0" />
+                                        </Grid>
+                                    </DockPanel>
+                                </RadioButton>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </Grid>
             </Border>
         </StackPanel>
     </Border>
diff --git a/src/Glazier.UI/LoadImageForm.xaml.cs b/src/Glazier.UI/LoadImageForm.xaml.cs
index fd08659..f5901cd 100644
--- a/src/Glazier.UI/LoadImageForm.xaml.cs
+++ b/src/Glazier.UI/LoadImageForm.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -36,6 +37,9 @@ private void RadioButton_Checked(object sender, RoutedEventArgs e)
         {
             if (sender is RadioButton selectedButton)
             {
+                SelectionHighlight.UpdateLayout();
+                GlazeMethodSelector.InvalidateArrange();
+
                 Animator.SelectAlgorithmRadioButton(selectedButton, this.GlazeMethodSelector, this.HighlightTransform, this.SelectionHighlight);
             }
         }
diff --git a/src/Glazier.UI/Themes/Dark.xaml b/src/Glazier.UI/Themes/Dark.xaml
index 11a33b6..67330bb 100644
--- a/src/Glazier.UI/Themes/Dark.xaml
+++ b/src/Glazier.UI/Themes/Dark.xaml
@@ -13,10 +13,10 @@
     <SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="Orange"/>
 
     <SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
+    <SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
     <SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
     <SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
     <SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonTextForegroundBrush" Color="Red"/>
-    <SolidColorBrush x:Key="AlgorithmSelectorMouseOverButtonTextForegroundBrush" Color="Red"/>
 
 
     <LinearGradientBrush x:Key="SplitterBrush" StartPoint="0,0" EndPoint="1,1">
diff --git a/src/Glazier.UI/Themes/HighContrast.xaml b/src/Glazier.UI/Themes/HighContrast.xaml
index dfa9bd0..93262cd 100644
--- a/src/Glazier.UI/Themes/HighContrast.xaml
+++ b/src/Glazier.UI/Themes/HighContrast.xaml
@@ -12,7 +12,7 @@
     <SolidColorBrush x:Key="ToolbarBorderBrush" Color="DarkGray"/>
     <SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="{DynamicResource SystemColors.ActiveBorder}"/>
 
-    <SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
     <SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
     <SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
     <SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
diff --git a/src/Glazier.UI/Themes/Light.xaml b/src/Glazier.UI/Themes/Light.xaml
index 7c3d3a8..4281227 100644
--- a/src/Glazier.UI/Themes/Light.xaml
+++ b/src/Glazier.UI/Themes/Light.xaml
@@ -12,7 +12,7 @@
     <SolidColorBrush x:Key="ToolbarBorderBrush" Color="DarkGray"/>
     <SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="Green"/>
 
-    <SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Transparent"/>
+    <SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
     <SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
     <SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
     <SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
diff --git a/src/Glazier.UI/Themes/Universal.xaml b/src/Glazier.UI/Themes/Universal.xaml
index aeab65c..e6b7a9a 100644
--- a/src/Glazier.UI/Themes/Universal.xaml
+++ b/src/Glazier.UI/Themes/Universal.xaml
@@ -426,6 +426,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="MinHeight" Value="100" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Foreground" Value="{DynamicResource AlgorithmSelectorButtonTextForegroundBrush}"/>
         <Style.Triggers>