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

[apps/code] Load Python in the viewWillAppear of the controllers

Browse Source
This commit is contained in:
Léa Saviot
2018-09-21 12:23:43 +02:00
parent 2661032993
commit c16d9e7ffe
4 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/code/console_controller.cpp
View File

@@ -105,7 +105,6 @@ const char * ConsoleController::inputText(const char * prompt) {
void ConsoleController::viewWillAppear() {
loadPythonEnvironment();
assert(pythonEnvironmentIsLoaded());
m_sandboxIsDisplayed = false;
if (m_importScriptsWhenViewAppears) {
m_importScriptsWhenViewAppears = false;
@@ -117,10 +116,6 @@ void ConsoleController::viewWillAppear() {
m_editCell.setText("");
}
void ConsoleController::didEnterResponderChain(Responder * previousFirstResponder) {
loadPythonEnvironment();
}
void ConsoleController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_editCell);
}

1
apps/code/console_controller.h
View File

@@ -38,7 +38,6 @@ public:
// ViewController
View * view() override { return &m_selectableTableView; }
void viewWillAppear() override;
void didEnterResponderChain(Responder * previousFirstResponder) override;
void didBecomeFirstResponder() override;
bool handleEvent(Ion::Events::Event event) override;
ViewController::DisplayParameter displayParameter() override { return ViewController::DisplayParameter::WantsMaximumSpace; }

8
apps/code/editor_controller.cpp
View File

@@ -41,19 +41,13 @@ bool EditorController::handleEvent(Ion::Events::Event event) {
return false;
}
void EditorController::didEnterResponderChain(Responder * previousFirstResponder) {
m_editorView.loadSyntaxHighlighter();
}
void EditorController::willExitResponderChain(Responder * nextFirstResponder) {
m_editorView.unloadSyntaxHighlighter();
}
void EditorController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_editorView);
}
void EditorController::viewWillAppear() {
m_editorView.loadSyntaxHighlighter();
m_editorView.setCursorLocation(strlen(m_editorView.text()));
}

2
apps/code/editor_controller.h
View File

@@ -18,8 +18,6 @@ public:
/* ViewController */
View * view() override { return &m_editorView; }
bool handleEvent(Ion::Events::Event event) override;
void didEnterResponderChain(Responder * previousFirstResponder) override;
void willExitResponderChain(Responder * nextFirstResponder) override;
void didBecomeFirstResponder() override;
void viewWillAppear() override;
void viewDidDisappear() override;