UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Factor Shared::TextFieldDelegateApp::isAcceptableText

Browse Source
This commit is contained in:
Ruben Dashyan
2019-07-19 11:24:42 +02:00
committed by EmilieNumworks
parent ff887ec4a0
commit 9611133276
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/calculation/edit_expression_controller.cpp
View File

@@ -121,7 +121,6 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
/* The input text store in m_cacheBuffer might have beed correct the first
* time but then be too long when replacing ans in another context */
if (!app()->isAcceptableText(m_cacheBuffer)) {
app()->displayWarning(I18n::Message::SyntaxError);
return true;
}
m_calculationStore->push(m_cacheBuffer, app()->localContext());

7
apps/shared/text_field_delegate_app.cpp
View File

@@ -25,7 +25,6 @@ bool TextFieldDelegateApp::textFieldShouldFinishEditing(TextField * textField, I
bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (textField->isEditing() && textField->shouldFinishEditing(event)) {
if (!isAcceptableText(textField->text())) {
displayWarning(I18n::Message::SyntaxError);
return true;
}
}
@@ -38,7 +37,11 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
bool TextFieldDelegateApp::isAcceptableText(const char * text) {
Expression exp = Expression::Parse(text);
return isAcceptableExpression(exp);
bool isAcceptable = isAcceptableExpression(exp);
if (!isAcceptable) {
displayWarning(I18n::Message::SyntaxError);
}
return isAcceptable;
}
bool TextFieldDelegateApp::hasUndefinedValue(const char * text, double & value) {