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

[Git] Fix conflicts

Browse Source
This commit is contained in:
Quentin
2020-04-01 11:36:16 +02:00
parent 735294b91b 511a96f464
commit 0d56576f9c
60 changed files with 1568 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/code/sandbox_controller.cpp
View File

@@ -1,14 +1,16 @@
#include "sandbox_controller.h"
#include <apps/apps_container.h>
extern "C" {
#include <python/port/mod/turtle/modturtle.h>
}
namespace Code {
SandboxController::SandboxController(Responder * parentResponder, MicroPython::ExecutionEnvironment * executionEnvironment) :
SandboxController::SandboxController(Responder * parentResponder) :
ViewController(parentResponder),
m_solidColorView(Palette::CodeBackground),
m_executionEnvironment(executionEnvironment)
m_solidColorView(Palette::CodeBackground)
{
assert(executionEnvironment != nullptr);
}
StackViewController * SandboxController::stackViewController() {
@@ -20,19 +22,12 @@ void SandboxController::reset() {
redrawWindow();
}
void SandboxController::hide() {
stackViewController()->pop();
}
void SandboxController::viewWillAppear() {
assert(m_executionEnvironment != nullptr);
m_executionEnvironment->setSandboxIsDisplayed(true);
redrawWindow();
}
void SandboxController::viewDidDisappear() {
assert(m_executionEnvironment != nullptr);
m_executionEnvironment->setSandboxIsDisplayed(false);
modturtle_view_did_disappear();
}
bool SandboxController::handleEvent(Ion::Events::Event event) {