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

5
apps/code/menu_controller.h
View File

@@ -24,6 +24,7 @@ public:
void reloadConsole();
void openConsoleWithScript(Script script);
void scriptContentEditionDidFinish();
void willExitApp();
/* ViewController */
View * view() override { return &m_selectableTableView; }
@@ -51,7 +52,7 @@ public:
/* TextFieldDelegate */
bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override;
bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override { return false; }
bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
bool textFieldDidAbortEditing(TextField * textField) override {
return privateTextFieldDidAbortEditing(textField, true);
@@ -67,7 +68,7 @@ public:
private:
static constexpr int k_maxNumberOfDisplayableScriptCells = 5; // = 240/50
static constexpr int k_parametersColumnWidth = 37;
static constexpr int k_parametersColumnWidth = Metric::EllipsisCellWidth;
static constexpr int AddScriptCellType = 0;
static constexpr int ScriptCellType = 1;
static constexpr int ScriptParameterCellType = 2;