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

[code] Script editor and Console are stacked.

Browse Source 
Before, they appeared in modal views.

Change-Id: I42ea742370cd3cf0854965f67fc44b43db4cc309
This commit is contained in:
Léa Saviot
2017-10-31 18:10:18 +01:00
committed by Romain Goyet
parent eadf4a018a
commit fbdf6379d8
9 changed files with 51 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/code/menu_controller.cpp
View File

@@ -15,7 +15,7 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
m_consoleButton(this, I18n::Message::Console, Invocation([](void * context, void * sender) {
MenuController * menu = (MenuController *)context;
if (menu->consoleController()->loadPythonEnvironment()) {
menu->app()->displayModalViewController(menu->consoleController(), 0.5f, 0.5f);
menu->stackViewController()->push(menu->consoleController());
return;
}
//TODO: Pop up warning message: not enough space to load Python
@@ -34,15 +34,13 @@ MenuController::MenuController(Responder * parentResponder, ScriptStore * script
m_selectableTableView.selectCellAtLocation(0, 0);
}
ConsoleController * MenuController::consoleController() {
return &m_consoleController;
}
View * MenuController::view() {
return &m_selectableTableView;
}
void MenuController::didBecomeFirstResponder() {
if (m_selectableTableView.selectedRow() < 0) {
assert(footer()->selectedButton() == 0);
app()->setFirstResponder(&m_consoleButton);
return;
}
assert(m_selectableTableView.selectedRow() < numberOfRows());
app()->setFirstResponder(&m_selectableTableView);
}
@@ -114,10 +112,6 @@ int MenuController::numberOfRows() {
//TODO do not add the addScript row if there can be no more scripts stored.
};
KDCoordinate MenuController::cellHeight() {
return k_rowHeight;
}
KDCoordinate MenuController::rowHeight(int j) {
return cellHeight();
}
@@ -213,19 +207,6 @@ bool MenuController::textFieldDidAbortEditing(TextField * textField, const char
return true;
}
Toolbox * MenuController::toolboxForTextField(TextField * textFied) {
return nullptr;
}
int MenuController::numberOfButtons(ButtonRowController::Position position) const {
return 1;
}
Button * MenuController::buttonAtIndex(int index, ButtonRowController::Position position) const {
assert(index == 0);
return const_cast<Button *>(&m_consoleButton);
}
StackViewController * MenuController::stackViewController() {
return static_cast<StackViewController *>(parentResponder()->parentResponder());
}