From 331388c00092a58d04b7ecadea50fd10442d4940 Mon Sep 17 00:00:00 2001
From: Callum Shipton <callumshipton@msn.com>
Date: Wed, 12 Aug 2020 16:53:31 +0100
Subject: [PATCH] Enable keyboard entry in bit-toggling mode #478 (#1346)

The programmer radix buttons were being disabled when the bit flip panel was selected, causing keyboard events to be ignored.
They should actually only be hidden in bit flip mode.

- Corrected programmer radix buttons to continue being enabled just hidden when the programmer calculator is in bit flip mode.
- Renamed AreProgrammerRadixOperatorsEnabled property to the more appropriate AreProgrammerRadixOperatorsVisible.
---
 src/CalcViewModel/StandardCalculatorViewModel.cpp | 2 +-
 src/CalcViewModel/StandardCalculatorViewModel.h   | 6 +++---
 src/Calculator/Views/OperatorsPanel.xaml          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index a148fe3..56f2bda 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -132,7 +132,7 @@ StandardCalculatorViewModel::StandardCalculatorViewModel()
     IsOperandEnabled = true;
     IsNegateEnabled = true;
     IsDecimalEnabled = true;
-    AreProgrammerRadixOperatorsEnabled = false;
+    AreProgrammerRadixOperatorsVisible = false;
 }
 
 String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue)
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h
index 1dbcc92..d60122b 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.h
+++ b/src/CalcViewModel/StandardCalculatorViewModel.h
@@ -76,7 +76,7 @@ namespace CalculatorApp
             OBSERVABLE_PROPERTY_R(CalculatorApp::Common::NumberBase, CurrentRadixType);
             OBSERVABLE_PROPERTY_R(bool, AreTokensUpdated);
             OBSERVABLE_PROPERTY_R(bool, AreAlwaysOnTopResultsUpdated);
-            OBSERVABLE_PROPERTY_R(bool, AreProgrammerRadixOperatorsEnabled);
+            OBSERVABLE_PROPERTY_R(bool, AreProgrammerRadixOperatorsVisible);
             OBSERVABLE_PROPERTY_R(bool, IsInputEmpty);
             OBSERVABLE_PROPERTY_R(CalculatorApp::Common::Automation::NarratorAnnouncement ^, Announcement);
             OBSERVABLE_PROPERTY_R(unsigned int, OpenParenthesisCount);
@@ -103,7 +103,7 @@ namespace CalculatorApp
                     {
                         m_isBitFlipChecked = value;
                         IsBinaryBitFlippingEnabled = IsProgrammer && m_isBitFlipChecked;
-                        AreProgrammerRadixOperatorsEnabled = IsProgrammer && !m_isBitFlipChecked;
+                        AreProgrammerRadixOperatorsVisible = IsProgrammer && !m_isBitFlipChecked;
                         RaisePropertyChanged(L"IsBitFlipChecked");
                     }
                 }
@@ -178,7 +178,7 @@ namespace CalculatorApp
                             IsBitFlipChecked = false;
                         }
                         IsBinaryBitFlippingEnabled = m_isProgrammer && IsBitFlipChecked;
-                        AreProgrammerRadixOperatorsEnabled = m_isProgrammer && !IsBitFlipChecked;
+                        AreProgrammerRadixOperatorsVisible = m_isProgrammer && !IsBitFlipChecked;
                         if (value)
                         {
                             IsStandard = false;
diff --git a/src/Calculator/Views/OperatorsPanel.xaml b/src/Calculator/Views/OperatorsPanel.xaml
index 1623792..b9b22f6 100644
--- a/src/Calculator/Views/OperatorsPanel.xaml
+++ b/src/Calculator/Views/OperatorsPanel.xaml
@@ -27,8 +27,8 @@
 
         <local:CalculatorProgrammerRadixOperators x:Name="ProgrammerRadixOperators"
                                                   TabIndex="16"
-                                                  Visibility="{x:Bind Model.AreProgrammerRadixOperatorsEnabled, Mode=OneWay}"
-                                                  IsEnabled="{x:Bind Model.AreProgrammerRadixOperatorsEnabled, Mode=OneWay}"
+                                                  Visibility="{x:Bind Model.AreProgrammerRadixOperatorsVisible, Mode=OneWay}"
+                                                  IsEnabled="{x:Bind Model.IsProgrammer, Mode=OneWay}"
                                                   x:Load="False"/>
 
     </Grid>