[code] Cleaned the prevention of ".py" edition.

Now the MenuController changes the cursor location if needed once the
Textfield has handled the event.

Change-Id: I1ad3202402623dfa9a683866fef90ca33ddd6be0
This commit is contained in:
Léa Saviot
2017-12-04 16:32:12 +01:00
parent 53c8b2215f
commit 71bfcbf5d7
2 changed files with 10 additions and 13 deletions

View File

@@ -272,18 +272,6 @@ bool MenuController::textFieldShouldFinishEditing(TextField * textField, Ion::Ev
}
bool MenuController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (event == Ion::Events::Right && textField->isEditing()) {
int scriptExtensionLength = strlen(ScriptStore::k_scriptExtension);
if (textField->cursorLocation() > textField->draftTextLength() - scriptExtensionLength - 1) {
return true;
}
}
if (event.hasText() && textField->isEditing()) {
size_t eventTextLength = strlen(event.text());
if (textField->draftTextLength() + eventTextLength >= TextField::maxBufferSize()) {
return true;
}
}
if (event == Ion::Events::Left && textField->isEditing() && textField->cursorLocation() == 0) {
return true;
}
@@ -334,6 +322,14 @@ bool MenuController::textFieldDidAbortEditing(TextField * textField, const char
return true;
}
bool MenuController::textFieldDidHandleEvent(TextField * textField, Ion::Events::Event event, bool returnValue) {
int scriptExtensionLength = strlen(ScriptStore::k_scriptExtension);
if (textField->isEditing() && textField->cursorLocation() > textField->draftTextLength() - scriptExtensionLength) {
textField->setCursorLocation(textField->draftTextLength() - scriptExtensionLength);
}
return returnValue;
}
void MenuController::addScript() {
if (m_scriptStore->addNewScript()) {
updateAddScriptRowDisplay();