UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 10:09:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Fix pop up clash when memory is full while editing a function

Browse Source 
There was a selection problem when editing a function failed because of
a full storage (k_storageSize = 1000)
This commit is contained in:
Léa Saviot
2018-10-26 13:22:26 +02:00
committed by Émilie Feral
parent bea78aa3b1
commit 00586b03d9
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
escher/src/input_view_controller.cpp
View File

@@ -50,9 +50,11 @@ bool InputViewController::textFieldShouldFinishEditing(TextField * textField, Io
}
bool InputViewController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
inputViewDidFinishEditing();
m_textFieldDelegate->textFieldDidFinishEditing(textField, text, event);
return true;
if (inputViewDidFinishEditing()) {
m_textFieldDelegate->textFieldDidFinishEditing(textField, text, event);
return true;
}
return false;
}
bool InputViewController::textFieldDidAbortEditing(TextField * textField) {
@@ -74,9 +76,11 @@ bool InputViewController::layoutFieldDidReceiveEvent(LayoutField * layoutField,
}
bool InputViewController::layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::Layout layoutR, Ion::Events::Event event) {
inputViewDidFinishEditing();
m_layoutFieldDelegate->layoutFieldDidFinishEditing(layoutField, layoutR, event);
return true;
if (inputViewDidFinishEditing()) {
m_layoutFieldDelegate->layoutFieldDidFinishEditing(layoutField, layoutR, event);
return true;
}
return false;
}
bool InputViewController::layoutFieldDidAbortEditing(LayoutField * layoutField) {
@@ -103,9 +107,12 @@ NestedMenuController * InputViewController::variableBoxForInputEventHandler(Inpu
return m_inputEventHandlerDelegate->variableBoxForInputEventHandler(handler);
}
void InputViewController::inputViewDidFinishEditing() {
m_successAction.perform(this);
dismissModalViewController();
bool InputViewController::inputViewDidFinishEditing() {
if (m_successAction.perform(this)) {
dismissModalViewController();
return true;
}
return false;
}
void InputViewController::inputViewDidAbortEditing() {