Wire up keyboard in graphing calculator (#863)

* Wire up graphing calculator keyboard with math rich edit control

* CR feedback

* Handle focus bug in flyout

Author: EriWong

src/CalcViewModel/Common/CalculatorButtonUser.h

@@ -120,11 +120,7 @@ public
         RshL = (int)CM::Command::CommandRSHFL,
         RolC = (int)CM::Command::CommandROLC,
         RorC = (int)CM::Command::CommandRORC,
-
-        Plot,
-        X,
-        Y,
-
+            
         BINSTART = (int)CM::Command::CommandBINEDITSTART,
         BINPOS0 = (int)CM::Command::CommandBINPOS0,
         BINPOS1 = (int)CM::Command::CommandBINPOS1,
@@ -198,6 +194,14 @@ public
         MemoryRecall = (int)CM::Command::CommandRECALL,
         MemoryClear = (int)CM::Command::CommandMCLEAR,
         BitflipButton = 1000,
-        FullKeypadButton = 1001
+        FullKeypadButton = 1001,
+
+        // Buttons used in graphing calculator
+        LessThan,
+        LessThanOrEqualTo,
+        GreaterThan,
+        GreaterThanOrEqualTo,
+        X,
+        Y
     };
 }

src/Calculator/Controls/MathRichEditBox.cpp

@@ -115,41 +115,86 @@ void MathRichEditBox::SetMathTextProperty(String ^ newValue)
     }
 
     this->IsReadOnly = readOnlyState;
-    SetValue(MathTextProperty, newValue);
 }
 
 void CalculatorApp::Controls::MathRichEditBox::OnLosingFocus(Windows::UI::Xaml::UIElement ^ sender, Windows::UI::Xaml::Input::LosingFocusEventArgs ^ args)
 {
-    auto newVal = GetMathTextProperty();
-    if (MathText != newVal)
-    {
-        SetValue(MathTextProperty, newVal);
-        EquationSubmitted(this, ref new MathRichEditBoxSubmission(true, EquationSubmissionSource::FOCUS_LOST));
-    }
-    else
-    {
-        EquationSubmitted(this, ref new MathRichEditBoxSubmission(false, EquationSubmissionSource::FOCUS_LOST));
-    }
+    SubmitEquation(EquationSubmissionSource::FOCUS_LOST);
 }
 
 void CalculatorApp::Controls::MathRichEditBox::OnKeyUp(Platform::Object ^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e)
 {
     if (e->Key == VirtualKey::Enter)
     {
-        auto newVal = GetMathTextProperty();
-        if (MathText != newVal)
-        {
-            SetValue(MathTextProperty, newVal);
-            EquationSubmitted(this, ref new MathRichEditBoxSubmission(true, EquationSubmissionSource::ENTER_KEY));
-        }
-        else
-        {
-            EquationSubmitted(this, ref new MathRichEditBoxSubmission(true, EquationSubmissionSource::ENTER_KEY));
-        }
+        SubmitEquation(EquationSubmissionSource::ENTER_KEY);
     }
 }
 
 void MathRichEditBox::OnMathTextPropertyChanged(Platform::String ^ oldValue, Platform::String ^ newValue)
 {
     SetMathTextProperty(newValue);
+    SetValue(MathTextProperty, newValue);
+}
+
+void MathRichEditBox::InsertText(Platform::String ^ text, int cursorOffSet, int selectionLength)
+{
+    // If the rich edit is empty, the math zone may not exist, and so selection (and thus the resulting text) will not be in a math zone.
+    // If the rich edit has content already, then the mathzone will already be created due to mathonly mode being set and the selection will exist inside the
+    // math zone. To handle this, we will force a math zone to be created in teh case of the text being empty and then replacing the text inside of the math
+    // zone with the newly inserted text.
+    if (GetMathTextProperty() == nullptr)
+    {
+        SetMathTextProperty("<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>x</mi></math>");
+        TextDocument->Selection->StartPosition = 0;
+        TextDocument->Selection->EndPosition = 1;
+    }
+
+    // insert the text in place of selection
+    TextDocument->Selection->SetText(Windows::UI::Text::TextSetOptions::FormatRtf, text);
+
+    // Move the cursor to the next logical place for users to enter text.
+    TextDocument->Selection->StartPosition += cursorOffSet;
+    TextDocument->Selection->EndPosition = TextDocument->Selection->StartPosition + selectionLength;
+}
+
+void MathRichEditBox::BackSpace()
+{
+    // if anything is selected, just delete the selection.  Note: EndPosition can be before start position.
+    if (TextDocument->Selection->StartPosition != TextDocument->Selection->EndPosition)
+    {
+        TextDocument->Selection->SetText(Windows::UI::Text::TextSetOptions::None, L"");
+        return;
+    }
+
+    // if we are at the start of the string, do nothing
+    if (TextDocument->Selection->StartPosition == 0)
+    {
+        return;
+    }
+
+    // Select the previous group.
+    TextDocument->Selection->EndPosition = TextDocument->Selection->StartPosition;
+    TextDocument->Selection->StartPosition -= 1;
+
+    // If the group contains anything complex, we want to give the user a chance to preview the deletion.
+    // If it's a single character, then just delete it.  Otherwise do nothing until the user triggers backspace again.
+    auto text = TextDocument->Selection->Text;
+    if (text->Length() == 1)
+    {
+        TextDocument->Selection->SetText(Windows::UI::Text::TextSetOptions::None, L"");
+    }
+}
+
+void MathRichEditBox::SubmitEquation(EquationSubmissionSource source)
+{
+    auto newVal = GetMathTextProperty();
+    if (MathText != newVal)
+    {
+        SetValue(MathTextProperty, newVal);
+        EquationSubmitted(this, ref new MathRichEditBoxSubmission(true, source));
+    }
+    else
+    {
+        EquationSubmitted(this, ref new MathRichEditBoxSubmission(false, source));
+    }
 }

src/Calculator/Controls/MathRichEditBox.h

@@ -13,6 +13,7 @@ namespace CalculatorApp
         {
             FOCUS_LOST,
             ENTER_KEY,
+            PROGRAMMATIC
         };
 
     public
@@ -40,6 +41,9 @@ namespace CalculatorApp
 
             event Windows::Foundation::EventHandler<MathRichEditBoxSubmission^> ^ EquationSubmitted;
             void OnMathTextPropertyChanged(Platform::String ^ oldValue, Platform::String ^ newValue);
+            void InsertText(Platform::String ^ text, int cursorOffSet, int selectionLength);
+            void SubmitEquation(EquationSubmissionSource source);
+            void BackSpace();
 
         private:
             Platform::String ^ GetMathTextProperty();

src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h

@@ -31,7 +31,7 @@ namespace CalculatorApp
 
         static Windows::UI::Xaml::Media::SolidColorBrush
             ^ ToSolidColorBrush(Windows::UI::Color color) { return ref new Windows::UI::Xaml::Media::SolidColorBrush(color); }
-    
+
     private:
         void OnPropertyChanged(Platform::String^ propertyName);
         void OnEquationsPropertyChanged();
@@ -59,7 +59,6 @@ namespace CalculatorApp
         void TextBoxKeyDown(Windows::UI::Xaml::Controls::TextBox ^ textbox, Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e);
         void SubmitTextbox(Windows::UI::Xaml::Controls::TextBox ^ textbox);
 
-    private:
         Windows::UI::ViewManagement::AccessibilitySettings ^ m_accessibilitySettings;
         int m_lastLineColorIndex;
         int m_lastFunctionLabelIndex;

src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml

@@ -514,7 +514,8 @@
                                      Variables="{x:Bind ViewModel.Variables}"
                                      Visibility="{x:Bind IsKeyGraphFeaturesVisible, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>
 
-            <local:GraphingNumPad Grid.Row="1"
+            <local:GraphingNumPad x:Name="GraphingNumberPad"
+                                  Grid.Row="1"
                                   Margin="2,0,2,2"
                                   Visibility="{x:Bind IsKeyGraphFeaturesVisible, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"/>