diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index cec835fb..114eb86d 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -1073,6 +1073,525 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Visible
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index 6c40aa2f..68448d7a 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -255,6 +255,7 @@
+
App.xaml
@@ -397,6 +398,7 @@
+
Create
Create
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index bc22d788..49e3f267 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -314,6 +314,11 @@
Controls
+
+
+
+ Controls
+
@@ -416,6 +421,11 @@
Controls
+
+
+
+ Controls
+
@@ -1582,4 +1592,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/Calculator/Controls/EquationTextBox.cpp b/src/Calculator/Controls/EquationTextBox.cpp
new file mode 100644
index 00000000..30b02140
--- /dev/null
+++ b/src/Calculator/Controls/EquationTextBox.cpp
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "EquationTextBox.h"
+
+using namespace Platform;
+using namespace CalculatorApp;
+using namespace CalculatorApp::Common;
+using namespace CalculatorApp::Controls;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Input;
+
+
+EquationTextBox::EquationTextBox()
+{
+ m_buttonCursor = ref new Windows::UI::Core::CoreCursor(Windows::UI::Core::CoreCursorType::Hand, 0);
+}
+
+void EquationTextBox::OnApplyTemplate()
+{
+ TextBox::OnApplyTemplate();
+
+ m_removeButton = dynamic_cast(GetTemplateChild("RemoveButton"));
+ m_colorChooserButton = dynamic_cast(GetTemplateChild("ColorChooserButton"));
+ m_functionButton = dynamic_cast(GetTemplateChild("FunctionButton"));
+
+ if (m_removeButton != nullptr)
+ {
+ m_removeButton->PointerEntered += ref new PointerEventHandler(this, &EquationTextBox::OnPointerEnteredButton);
+ }
+
+ if (m_colorChooserButton != nullptr)
+ {
+ m_colorChooserButton->PointerEntered += ref new PointerEventHandler(this, &EquationTextBox::OnPointerEnteredButton);
+ }
+
+ if (m_functionButton != nullptr)
+ {
+ m_functionButton->PointerEntered += ref new PointerEventHandler(this, &EquationTextBox::OnPointerEnteredButton);
+ }
+}
+
+
+
+void EquationTextBox::OnPointerEnteredButton(_In_ Object^ sender, _In_ PointerRoutedEventArgs^ e)
+{
+ m_cursorBeforePointerEntered = Window::Current->CoreWindow->PointerCursor;
+ Window::Current->CoreWindow->PointerCursor = m_buttonCursor;
+}
+
+void EquationTextBox::OnPointerExitedButton(_In_ Object^ sender, _In_ PointerRoutedEventArgs^ e)
+{
+
+}
diff --git a/src/Calculator/Controls/EquationTextBox.h b/src/Calculator/Controls/EquationTextBox.h
new file mode 100644
index 00000000..9c170b82
--- /dev/null
+++ b/src/Calculator/Controls/EquationTextBox.h
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "CalcViewModel/Common/Utils.h"
+
+namespace CalculatorApp
+{
+ namespace Controls
+ {
+ public ref class EquationTextBox sealed : public Windows::UI::Xaml::Controls::TextBox
+ {
+ public:
+ EquationTextBox();
+
+ event Windows::UI::Xaml::RoutedEventHandler^ FunctionButtonClicked;
+ event Windows::UI::Xaml::RoutedEventHandler^ ColorChangeButtonClicked;
+ event Windows::UI::Xaml::RoutedEventHandler^ RemoveButtonClicked;
+
+ protected:
+ virtual void OnApplyTemplate() override;
+
+ private:
+ void OnPointerEnteredButton(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
+ void OnPointerExitedButton(_In_ Platform::Object^ sender, _In_ Windows::UI::Xaml::Input::PointerRoutedEventArgs^ e);
+
+ Windows::UI::Core::CoreCursor^ m_cursorBeforePointerEntered;
+ Windows::UI::Core::CoreCursor^ m_buttonCursor;
+ Windows::UI::Xaml::Controls::Button^ m_removeButton;
+ Windows::UI::Xaml::Controls::Button^ m_colorChooserButton;
+ Windows::UI::Xaml::Controls::Button^ m_functionButton;
+ };
+ }
+}
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 9233a5ae..acfbb2db 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -3415,4 +3415,8 @@
^
{Locked}This is the character that should trigger this button. Note that it is a character and not a key, so it does not come from the Windows::System::VirtualKey enum.
+
+ Add Equation
+ Placeholder text for the equation input button
+
diff --git a/src/Calculator/Resources/es-ES/Resources.resw b/src/Calculator/Resources/es-ES/Resources.resw
index e2e44b8e..3da471d9 100644
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@@ -1,4 +1,4 @@
-
+