Merge branch 'SaisieJolie30Apr' into SaisieJolie8May

Change-Id: Ia4196119fc56c5bc3423aea752b49f3f7ba39499
This commit is contained in:
Léa Saviot
2018-05-08 15:11:51 +02:00
234 changed files with 7421 additions and 1664 deletions

View File

@@ -57,7 +57,7 @@ void MenuController::willExitResponderChain(Responder * nextFirstResponder) {
TextField * tf = static_cast<EvenOddEditableTextCell *>(m_selectableTableView.selectedCell())->editableTextCell()->textField();
if (tf->isEditing()) {
tf->setEditing(false);
textFieldDidAbortEditing(tf, tf->text());
textFieldDidAbortEditing(tf);
}
}
}
@@ -345,8 +345,8 @@ bool MenuController::textFieldDidFinishEditing(TextField * textField, const char
return false;
}
bool MenuController::textFieldDidAbortEditing(TextField * textField, const char * text) {
if (strlen(text) <= strlen(ScriptStore::k_scriptExtension)) {
bool MenuController::textFieldDidAbortEditing(TextField * textField) {
if (strlen(textField->text()) <= strlen(ScriptStore::k_scriptExtension)) {
// The previous text was an empty name. Use a numbered default script name.
char numberedDefaultName[k_defaultScriptNameMaxSize];
numberedDefaultScriptName(numberedDefaultName);