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

Fixed some conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
parent d057d66949 7123c7c098
commit ab8f731515
687 changed files with 13048 additions and 4057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/code/menu_controller.cpp
View File

@@ -169,6 +169,10 @@ void MenuController::scriptContentEditionDidFinish() {
reloadConsole();
}
void MenuController::willExitApp() {
m_editorController.willExitApp();
}
int MenuController::numberOfRows() const {
return m_scriptStore->numberOfScripts() + m_shouldDisplayAddScriptRow;
}
@@ -299,24 +303,6 @@ bool MenuController::textFieldShouldFinishEditing(TextField * textField, Ion::Ev
|| event == Ion::Events::Down || event == Ion::Events::Up;
}
bool MenuController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (event == Ion::Events::Right
&& textField->isEditing()
&& textField->cursorLocation() == textField->text() + textField->draftTextLength()) {
return true;
}
if (event == Ion::Events::Clear && textField->isEditing()) {
constexpr size_t k_bufferSize = 4;
char buffer[k_bufferSize] = {'.', 0, 0, 0};
assert(k_bufferSize >= 1 + strlen(ScriptStore::k_scriptExtension) + 1);
strlcpy(&buffer[1], ScriptStore::k_scriptExtension, strlen(ScriptStore::k_scriptExtension) + 1);
textField->setText(buffer);
textField->setCursorLocation(textField->text());
return true;
}
return false;
}
bool MenuController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
const char * newName;
static constexpr int bufferSize = Script::k_defaultScriptNameMaxSize + 1 + ScriptStore::k_scriptExtensionLength; //"script99" + "." + "py"