Fix focus for EquationTextBox (#787)

2019-11-13 13:10:05 -08:00
parent 442ed6a861
commit afc1b2146c
3 changed files with 11 additions and 6 deletions
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
@@ -87,7 +87,11 @@ void EquationInputArea::InputTextBox_Submitted(Object ^ sender, RoutedEventArgs
    auto tb = static_cast<EquationTextBox ^>(sender);
    auto eq = static_cast<EquationViewModel ^>(tb->DataContext);
    eq->Expression = tb->GetEquationText();
-    FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
+
+    if (tb->HasFocus)
+    {
+        FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
+    }
 }

 void EquationInputArea::EquationTextBox_RemoveButtonClicked(Object ^ sender, RoutedEventArgs ^ e)