From 454af4ad8f66b02e83158133b03f174344ed470b Mon Sep 17 00:00:00 2001
From: Florian Stinglmayr <fstinglmayr@gmail.com>
Date: Tue, 29 Nov 2022 18:05:08 +0100
Subject: [PATCH] fix profit adjustment window

---
 EliteBGS/MainWindow.xaml    | 7 ++++---
 EliteBGS/MainWindow.xaml.cs | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/EliteBGS/MainWindow.xaml b/EliteBGS/MainWindow.xaml
index c34fd8f..b1e30e3 100644
--- a/EliteBGS/MainWindow.xaml
+++ b/EliteBGS/MainWindow.xaml
@@ -73,7 +73,7 @@
                                         <TextBlock Text="{Binding Faction}" FontWeight="DemiBold" Visibility="{Binding HasFaction}"/>
                                     </StackPanel>
                                     <Separator Visibility="Hidden" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />
-                                    <StackPanel Grid.Column="2">
+                                    <StackPanel Grid.Column="2" HorizontalAlignment="Right">
                                         <Button x:Name="AddCombatZone" Content="Add Combat Zone" Click="AddCombatZone_Click" />
                                     </StackPanel>
                                 </Grid>
@@ -89,13 +89,14 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="*" />
                                                 <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
                                             <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
                                                 <CheckBox Focusable="False" IsChecked="{Binding IsEnabled}" VerticalAlignment="Center"/>
                                                 <TextBlock Text="{Binding CompletedAt}" Margin="5,0,5,0" HorizontalAlignment="Right" TextAlignment="Center"/>
                                                 <TextBlock Text="{Binding Name}" FontWeight="DemiBold" TextAlignment="Center"/>
                                             </StackPanel>
-                                            <Separator Visibility="Hidden" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />
+                                            <!--<Separator Visibility="Hidden" Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" />-->
                                             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="CombatZone" Visibility="{Binding IsCombatZone}">
                                                 <ToggleButton x:Name="CapitalShip" Margin="2,0,2,0" Content="Capital Ship" Visibility="{Binding IsShipCombatZone}" IsChecked="{Binding HasCapitalShip, Mode=TwoWay}" IsThreeState="False"/>
                                                 <ToggleButton x:Name="Captain" Margin="2,0,2,0" Content="Captain" Visibility="{Binding IsShipCombatZone}" IsChecked="{Binding HasCaptain, Mode=TwoWay}" IsThreeState="False"/>
@@ -114,7 +115,7 @@
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" x:Name="SellCargo" Visibility="{Binding IsSellCargo}">
                                                 <TextBlock Text="Adjust Profit: " TextAlignment="Center" />
-                                                <TextBox x:Name="Profit" MinWidth="80" HorizontalContentAlignment="Right" Text="{Binding Profit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextChanged="Profit_TextChanged"/>
+                                                <TextBox x:Name="Profit" MinWidth="80" HorizontalContentAlignment="Right" Text="{Binding Profit, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" LostFocus="Profit_LostFocus" KeyUp="Profit_KeyUp"/>
                                             </StackPanel>
                                         </Grid>
                                     </HierarchicalDataTemplate>
diff --git a/EliteBGS/MainWindow.xaml.cs b/EliteBGS/MainWindow.xaml.cs
index 078e83f..329fc1c 100644
--- a/EliteBGS/MainWindow.xaml.cs
+++ b/EliteBGS/MainWindow.xaml.cs
@@ -329,7 +329,13 @@ public partial class MainWindow : Window {
         RefreshView();
     }
 
-    private void Profit_TextChanged(object sender, TextChangedEventArgs e) {
+    private void Profit_LostFocus(object sender, RoutedEventArgs e) {
         RefreshView();
     }
+
+    private void Profit_KeyUp(object sender, System.Windows.Input.KeyEventArgs e) {
+        if (e.Key == Key.Enter) {
+            RefreshView();
+        }
+    }
 }