From 9c6920ae68f43210caa8df23233ce663cf829a51 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Fri, 5 Jul 2019 15:05:42 -0700
Subject: [PATCH] Be a bit more WPF-ish on the OK button management

---
 SourceGenWPF/WpfGui/EditAddress.xaml          |  7 +--
 SourceGenWPF/WpfGui/EditAddress.xaml.cs       | 48 +++++++++++--------
 .../WpfGui/EditProjectProperties.xaml.cs      |  2 +-
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/SourceGenWPF/WpfGui/EditAddress.xaml b/SourceGenWPF/WpfGui/EditAddress.xaml
index cd982e4..a4937c5 100644
--- a/SourceGenWPF/WpfGui/EditAddress.xaml
+++ b/SourceGenWPF/WpfGui/EditAddress.xaml
@@ -32,7 +32,8 @@ limitations under the License.
 
         <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
             <TextBlock Text="Address:"/>
-            <TextBox Name="addrTextBox" Width="100" Margin="4,0,0,0"
+            <!--<TextBlock Text="$" FontFamily="{StaticResource GeneralMonoFont}" Margin="4,2,0,0"/>-->
+            <TextBox Name="addrTextBox" Width="100" Margin="4,1,0,0"
                      FontFamily="{StaticResource GeneralMonoFont}"
                      Text="{Binding Path=AddressText, UpdateSourceTrigger=PropertyChanged}"
                      IsInactiveSelectionHighlightEnabled="True"
@@ -46,8 +47,8 @@ limitations under the License.
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0">
-            <Button Name="okButton" Content="OK" IsDefault="True"
-                    Width="70" Click="OkButton_Click"/>
+            <Button Name="okButton" Content="OK" IsDefault="True" Width="70"
+                    IsEnabled="{Binding IsValid}" Click="OkButton_Click"/>
             <Button Name="cancelButton" Content="Cancel" IsCancel="True"
                     Width="70" Margin="4,0,0,0"/>
         </StackPanel>
diff --git a/SourceGenWPF/WpfGui/EditAddress.xaml.cs b/SourceGenWPF/WpfGui/EditAddress.xaml.cs
index e5afa06..240df5e 100644
--- a/SourceGenWPF/WpfGui/EditAddress.xaml.cs
+++ b/SourceGenWPF/WpfGui/EditAddress.xaml.cs
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -22,7 +24,7 @@ namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Edit Address dialog.
     /// </summary>
-    public partial class EditAddress : Window {
+    public partial class EditAddress : Window, INotifyPropertyChanged {
         /// <summary>
         /// Address typed by user. Only valid after the dialog returns OK.  Will be set to -1
         /// if the user is attempting to delete the address.
@@ -39,6 +41,24 @@ namespace SourceGenWPF.WpfGui {
         /// </summary>
         public string AddressText { get; set; }
 
+        /// <summary>
+        /// Set to true when input is valid.  Controls whether the OK button is enabled.
+        /// </summary>
+        public bool IsValid {
+            get { return mIsValid; }
+            set {
+                mIsValid = value;
+                OnPropertyChanged();
+            }
+        }
+        private bool mIsValid;
+
+        // INotifyPropertyChanged implementation
+        public event PropertyChangedEventHandler PropertyChanged;
+        private void OnPropertyChanged([CallerMemberName] string propertyName = "") {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
 
         public EditAddress(Window owner, int initialAddr, int maxAddressValue) {
             // Set the property before initializing the window -- we don't have a property
@@ -47,9 +67,9 @@ namespace SourceGenWPF.WpfGui {
             mMaxAddressValue = maxAddressValue;
             AddressText = Asm65.Address.AddressToString(initialAddr, false);
 
-            this.DataContext = this;
             InitializeComponent();
             Owner = owner;
+            DataContext = this;
         }
 
         private void OkButton_Click(object sender, RoutedEventArgs e) {
@@ -71,16 +91,12 @@ namespace SourceGenWPF.WpfGui {
         /// </remarks>
         private void TextBox_TextChanged(object sender, TextChangedEventArgs e) {
             if (IsLoaded) {
-                UpdateOkEnabled();
+                string text = AddressText;
+                IsValid = (text.Length == 0) ||
+                    Asm65.Address.ParseAddress(text, mMaxAddressValue, out int unused);
             }
         }
 
-        private void UpdateOkEnabled() {
-            string text = AddressText;
-            okButton.IsEnabled = (text.Length == 0) ||
-                Asm65.Address.ParseAddress(text, mMaxAddressValue, out int unused);
-        }
-
         private void Window_Loaded(object sender, RoutedEventArgs e) {
             addrTextBox.SelectAll();
             addrTextBox.Focus();
@@ -88,18 +104,12 @@ namespace SourceGenWPF.WpfGui {
     }
 
 
-    // I briefly played with the validation rules.  However, they're primarily designed for
-    // form entry, which means they fire when focus leaves the text box.  [note: not sure if
-    // this would change with UpdateSourceTrigger=PropertyChanged]  I want the OK button to be
-    // kept constantly up to date as the user types, so this didn't really work.  It's also a
-    // lot bigger and uglier than just handling an event.
-    //
-    // It's also sort of awkward to pass parameters, like MaxAddressValue, into the
-    // validation rule.
+    // This might be better with validation rules, but it's sort of awkward to pass parameters
+    // (like MaxAddressValue) in.
     // https://social.technet.microsoft.com/wiki/contents/articles/31422.wpf-passing-a-data-bound-value-to-a-validation-rule.aspx
     //
-    // Speaking of awkward, updating the OK button enable/disable through validation
-    // is possible via MultiDataTrigger.
+    // Speaking of awkward, updating the OK button's IsEnable value through validation
+    // requires MultiDataTrigger.
 
 
     //public class AddressValidationRule : ValidationRule {
diff --git a/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs b/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
index e5e7771..47e0039 100644
--- a/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
+++ b/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
@@ -24,11 +24,11 @@ using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Microsoft.Win32;
 
 using Asm65;
 using CommonUtil;
 using CommonWPF;
-using Microsoft.Win32;
 
 namespace SourceGenWPF.WpfGui {
     /// <summary>