DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with sin being parsed incorrectly (#1199)

Browse Source
This commit is contained in:
Eric Wong 2020-05-08 10:31:02 -07:00 committed by GitHub
parent 1e302cac58
commit e9c96c939a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Calculator/Controls/MathRichEditBox.cpp
View File

@ -10,6 +10,7 @@ using namespace CalculatorApp::Common;
using namespace CalculatorApp::Controls; using namespace CalculatorApp::Controls;
using namespace std; using namespace std;
using namespace Windows::ApplicationModel; using namespace Windows::ApplicationModel;
using namespace Windows::UI::Core;
using namespace Windows::UI::Xaml; using namespace Windows::UI::Xaml;
using namespace Windows::UI::Xaml::Controls; using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Text; using namespace Windows::UI::Text;
@ -125,6 +126,16 @@ void CalculatorApp::Controls::MathRichEditBox::OnKeyUp(Platform::Object ^ sender
} }
} }
void CalculatorApp::Controls::MathRichEditBox::OnKeyDown(Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e)
{
// suppress control + B to prevent bold input from being entered
if ((Window::Current->CoreWindow->GetKeyState(VirtualKey::Control) & CoreVirtualKeyStates::Down) != CoreVirtualKeyStates::Down ||
e->Key != VirtualKey::B)
{
Windows::UI::Xaml::Controls::RichEditBox::OnKeyDown(e);
}
}
void MathRichEditBox::OnMathTextPropertyChanged(Platform::String ^ oldValue, Platform::String ^ newValue) void MathRichEditBox::OnMathTextPropertyChanged(Platform::String ^ oldValue, Platform::String ^ newValue)
{ {
SetMathTextProperty(newValue); SetMathTextProperty(newValue);
@ -189,7 +200,6 @@ void MathRichEditBox::SubmitEquation(EquationSubmissionSource source)
if (range != nullptr) if (range != nullptr)
{ {
range->CharacterFormat->Bold = FormatEffect::Off;
range->CharacterFormat->Underline = UnderlineType::None; range->CharacterFormat->Underline = UnderlineType::None;
} }

3
src/Calculator/Controls/MathRichEditBox.h
View File

@ -60,6 +60,9 @@ namespace CalculatorApp
void SubmitEquation(EquationSubmissionSource source); void SubmitEquation(EquationSubmissionSource source);
void BackSpace(); void BackSpace();
protected:
void OnKeyDown(Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e) override;
private: private:
Platform::String ^ GetMathTextProperty(); Platform::String ^ GetMathTextProperty();
void SetMathTextProperty(Platform::String ^ newValue); void SetMathTextProperty(Platform::String ^ newValue);