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

Fix line becoming enabled on focus lost (#1167)

Browse Source
This commit is contained in:
Pepe Rivera 2020-04-14 15:51:17 -07:00 committed by GitHub
parent 3a8fcaa18a
commit 15b957c98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@ -800,6 +800,7 @@
DataContext="{x:Bind Mode=OneWay}" DataContext="{x:Bind Mode=OneWay}"
DataContextChanged="EquationTextBox_DataContextChanged" DataContextChanged="EquationTextBox_DataContextChanged"
EquationButtonClicked="EquationTextBox_EquationButtonClicked" EquationButtonClicked="EquationTextBox_EquationButtonClicked"
IsEquationLineDisabled="{x:Bind IsLineEnabled, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}"
EquationButtonContentIndex="{x:Bind FunctionLabelIndex, Mode=OneWay}" EquationButtonContentIndex="{x:Bind FunctionLabelIndex, Mode=OneWay}"
EquationColor="{x:Bind local:EquationInputArea.ToSolidColorBrush(LineColor), Mode=OneWay}" EquationColor="{x:Bind local:EquationInputArea.ToSolidColorBrush(LineColor), Mode=OneWay}"
EquationFormatRequested="EquationTextBox_EquationFormatRequested" EquationFormatRequested="EquationTextBox_EquationFormatRequested"

6
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
View File

@ -153,7 +153,11 @@ void EquationInputArea::EquationTextBox_Submitted(Object ^ sender, MathRichEditB
|| (submission->Source == EquationSubmissionSource::FOCUS_LOST && submission->HasTextChanged && eq->Expression != nullptr || (submission->Source == EquationSubmissionSource::FOCUS_LOST && submission->HasTextChanged && eq->Expression != nullptr
&& eq->Expression->Length() > 0)) && eq->Expression->Length() > 0))
{ {
eq->IsLineEnabled = true; if (submission->Source == EquationSubmissionSource::ENTER_KEY)
{
eq->IsLineEnabled = true;
}
unsigned int index = 0; unsigned int index = 0;
if (Equations->IndexOf(eq, &index)) if (Equations->IndexOf(eq, &index))
{ {