Merge branch 'master' into python_turtle

This commit is contained in:
Léa Saviot
2018-12-17 15:49:46 +01:00
739 changed files with 13354 additions and 5974 deletions

View File

@@ -23,6 +23,7 @@ void SandboxController::viewWillAppear() {
}
bool SandboxController::handleEvent(Ion::Events::Event event) {
// The sandbox handles or "absorbs" all keyboard events except Home and OnOff
if (event == Ion::Events::Home || event == Ion::Events::OnOff) {
stackViewController()->pop();
return false;
@@ -30,7 +31,7 @@ bool SandboxController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::Back) {
stackViewController()->pop();
}
return true;
return event.isKeyboardEvent();
}
void SandboxController::redrawWindow() {