From 96111332765b48531fee5a8d85810a3cfae73f76 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 19 Jul 2019 11:24:42 +0200 Subject: [PATCH] [apps] Factor Shared::TextFieldDelegateApp::isAcceptableText --- apps/calculation/edit_expression_controller.cpp | 1 - apps/shared/text_field_delegate_app.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp index de82ba2d7..bcb0540bc 100644 --- a/apps/calculation/edit_expression_controller.cpp +++ b/apps/calculation/edit_expression_controller.cpp @@ -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()); diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp index 95efd302f..8287cee34 100644 --- a/apps/shared/text_field_delegate_app.cpp +++ b/apps/shared/text_field_delegate_app.cpp @@ -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) {