diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp index 64e7fbc66..5065d85ac 100644 --- a/apps/code/console_controller.cpp +++ b/apps/code/console_controller.cpp @@ -194,10 +194,13 @@ void ConsoleController::viewWillAppear() { m_importScriptsWhenViewAppears = false; autoImport(); } + + Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME m_selectableTableView.reloadData(); m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines()); m_editCell.setEditing(true); m_editCell.setText(""); + Container::activeApp()->setFirstResponder(firstResponder); // FIXME } void ConsoleController::didBecomeFirstResponder() { @@ -495,10 +498,12 @@ void ConsoleController::autoImportScript(Script script, bool force) { runAndPrintForCommand(command); } if (!sandboxIsDisplayed() && force) { + Responder * firstResponder = Container::activeApp()->firstResponder(); // FIXME m_selectableTableView.reloadData(); m_selectableTableView.selectCellAtLocation(0, m_consoleStore.numberOfLines()); m_editCell.setEditing(true); m_editCell.setText(""); + Container::activeApp()->setFirstResponder(firstResponder); // FIXME } } diff --git a/apps/code/script_template.cpp b/apps/code/script_template.cpp index 9ccfc6fff..dfa40a157 100644 --- a/apps/code/script_template.cpp +++ b/apps/code/script_template.cpp @@ -40,18 +40,13 @@ def mandelbrot(N_iteration): # Draw a pixel colored in 'col' at position (x,y) kandinsky.set_pixel(x,y,col))"); -constexpr ScriptTemplate polynomialScriptTemplate("polynomial.py", "\x01" R"(from math import * -# roots(a,b,c) computes the solutions of the equation a*x**2+b*x+c=0 -def roots(a,b,c): - delta = b*b-4*a*c - if delta == 0: - return -b/(2*a) - elif delta > 0: - x_1 = (-b-sqrt(delta))/(2*a) - x_2 = (-b+sqrt(delta))/(2*a) - return x_1, x_2 - else: - return None)"); +constexpr ScriptTemplate polynomialScriptTemplate("polynomial.py", "\x01" R"(from pyplot import * +x = [1,2,3,4] +y = [-1,-2,-3,-4] +scatter(x, y) +plot(y, x) +text(-1,-1,"Coucou") +show())"); const ScriptTemplate * ScriptTemplate::Empty() { return &emptyScriptTemplate;