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

[escher] InputViewController: call the textField/ExpressionLayout

Browse Source 
delegate 'DidFinishEvent' after performing the sucess or abort action
This commit is contained in:
Émilie Feral
2018-06-07 11:20:51 +02:00
parent bc8dbd85c1
commit 06b552c033
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
escher/src/input_view_controller.cpp
View File

@@ -55,11 +55,15 @@ bool InputViewController::textFieldShouldFinishEditing(TextField * textField, Io
}
bool InputViewController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
return inputViewDidFinishEditing();
inputViewDidFinishEditing();
m_textFieldDelegate->textFieldDidFinishEditing(textField, text, event);
return true;
}
bool InputViewController::textFieldDidAbortEditing(TextField * textField) {
return inputViewDidAbortEditing();
inputViewDidAbortEditing();
m_textFieldDelegate->textFieldDidAbortEditing(textField);
return true;
}
bool InputViewController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
@@ -79,11 +83,15 @@ bool InputViewController::expressionLayoutFieldDidReceiveEvent(ExpressionLayoutF
}
bool InputViewController::expressionLayoutFieldDidFinishEditing(ExpressionLayoutField * expressionLayoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) {
return inputViewDidFinishEditing();
inputViewDidFinishEditing();
m_expressionLayoutFieldDelegate->expressionLayoutFieldDidFinishEditing(expressionLayoutField, layout, event);
return true;
}
bool InputViewController::expressionLayoutFieldDidAbortEditing(ExpressionLayoutField * expressionLayoutField) {
return inputViewDidAbortEditing();
inputViewDidAbortEditing();
m_expressionLayoutFieldDelegate->expressionLayoutFieldDidAbortEditing(expressionLayoutField);
return true;
}
void InputViewController::expressionLayoutFieldDidChangeSize(ExpressionLayoutField * expressionLayoutField) {
@@ -100,14 +108,12 @@ Toolbox * InputViewController::toolboxForExpressionLayoutField(ExpressionLayoutF
return m_expressionLayoutFieldDelegate->toolboxForExpressionLayoutField(expressionLayoutField);
}
bool InputViewController::inputViewDidFinishEditing() {
void InputViewController::inputViewDidFinishEditing() {
m_successAction.perform(this);
dismissModalViewController();
return true;
}
bool InputViewController::inputViewDidAbortEditing() {
void InputViewController::inputViewDidAbortEditing() {
m_failureAction.perform(this);
dismissModalViewController();
return true;
}