From f5e53e03e3cdb820fcbeb46224f947f9c1ca4d15 Mon Sep 17 00:00:00 2001 From: Neven Sajko Date: Fri, 21 Feb 2020 12:55:02 +0000 Subject: [PATCH 1/7] [apps/code] Deduplicate definitions of pi and e Merge the language-specific definitions of these mathematical constants into one definition. Note that the definitions were in fact inconsistent across languages. --- apps/code/catalog.de.i18n | 2 -- apps/code/catalog.en.i18n | 2 -- apps/code/catalog.es.i18n | 2 -- apps/code/catalog.fr.i18n | 2 -- apps/code/catalog.pt.i18n | 2 -- apps/code/catalog.universal.i18n | 2 ++ 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apps/code/catalog.de.i18n b/apps/code/catalog.de.i18n index 7427b60c9..31d7b0099 100644 --- a/apps/code/catalog.de.i18n +++ b/apps/code/catalog.de.i18n @@ -32,7 +32,6 @@ PythonCount = "Count the occurrences of x" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" PythonDrawString = "Display a text from pixel (x,y)" -PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" PythonEval = "Return the evaluated expression" @@ -124,7 +123,6 @@ PythonModf = "Fractional and integer parts of x" PythonMonotonic = "Value of a monotonic clock" PythonOct = "Convert integer to octal" PythonPhase = "Phase of z" -PythonConstantPi = "3.141592653589794" PythonPolar = "z in polar coordinates" PythonPop = "Remove and return the last item" PythonPower = "x raised to the power y" diff --git a/apps/code/catalog.en.i18n b/apps/code/catalog.en.i18n index c0eb9a652..1a222ea9d 100644 --- a/apps/code/catalog.en.i18n +++ b/apps/code/catalog.en.i18n @@ -32,7 +32,6 @@ PythonCount = "Count the occurrences of x" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" PythonDrawString = "Display a text from pixel (x,y)" -PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" PythonEval = "Return the evaluated expression" @@ -124,7 +123,6 @@ PythonModf = "Fractional and integer parts of x" PythonMonotonic = "Value of a monotonic clock" PythonOct = "Convert integer to octal" PythonPhase = "Phase of z" -PythonConstantPi = "3.141592653589794" PythonPolar = "z in polar coordinates" PythonPop = "Remove and return the last item" PythonPower = "x raised to the power y" diff --git a/apps/code/catalog.es.i18n b/apps/code/catalog.es.i18n index c0eb9a652..1a222ea9d 100644 --- a/apps/code/catalog.es.i18n +++ b/apps/code/catalog.es.i18n @@ -32,7 +32,6 @@ PythonCount = "Count the occurrences of x" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" PythonDrawString = "Display a text from pixel (x,y)" -PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" PythonEval = "Return the evaluated expression" @@ -124,7 +123,6 @@ PythonModf = "Fractional and integer parts of x" PythonMonotonic = "Value of a monotonic clock" PythonOct = "Convert integer to octal" PythonPhase = "Phase of z" -PythonConstantPi = "3.141592653589794" PythonPolar = "z in polar coordinates" PythonPop = "Remove and return the last item" PythonPower = "x raised to the power y" diff --git a/apps/code/catalog.fr.i18n b/apps/code/catalog.fr.i18n index 7869dd70c..7d2dda261 100644 --- a/apps/code/catalog.fr.i18n +++ b/apps/code/catalog.fr.i18n @@ -32,7 +32,6 @@ PythonCount = "Compte les occurrences de x" PythonDegrees = "Conversion de radians en degrés" PythonDivMod = "Quotient et reste" PythonDrawString = "Affiche un texte au pixel (x,y)" -PythonConstantE = "2.718281828459045" PythonErf = "Fonction d'erreur" PythonErfc = "Fonction d'erreur complémentaire" PythonEval = "Evalue l'expression en argument " @@ -124,7 +123,6 @@ PythonModf = "Parties fractionnaire et entière" PythonMonotonic = "Renvoie la valeur de l'horloge" PythonOct = "Conversion en octal" PythonPhase = "Argument de z" -PythonConstantPi = "3.141592653589793" PythonPolar = "Conversion en polaire" PythonPop = "Supprime le dernier élément" PythonPower = "x à la puissance y" diff --git a/apps/code/catalog.pt.i18n b/apps/code/catalog.pt.i18n index b38bf4bb2..7555ecdab 100644 --- a/apps/code/catalog.pt.i18n +++ b/apps/code/catalog.pt.i18n @@ -32,7 +32,6 @@ PythonCount = "Count the occurrences of x" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" PythonDrawString = "Display a text from pixel (x,y)" -PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" PythonEval = "Return the evaluated expression" @@ -124,7 +123,6 @@ PythonModf = "Fractional and integer parts of x" PythonMonotonic = "Value of a monotonic clock" PythonOct = "Convert integer to octal" PythonPhase = "Phase of z" -PythonConstantPi = "3.141592653589794" PythonPolar = "z in polar coordinates" PythonPop = "Remove and return the last item" PythonPower = "x raised to the power y" diff --git a/apps/code/catalog.universal.i18n b/apps/code/catalog.universal.i18n index 3b73483d0..59b7fec3a 100644 --- a/apps/code/catalog.universal.i18n +++ b/apps/code/catalog.universal.i18n @@ -185,6 +185,8 @@ PythonCommandTrunc = "trunc(x)" PythonCommandTurtleFunction = "turtle.function" PythonCommandTurtleFunctionWithoutArg = "turtle.\x11" PythonCommandUniform = "uniform(a,b)" +PythonConstantE = "2.718281828459045" +PythonConstantPi = "3.141592653589793" PythonTurtleCommandBackward = "backward(x)" PythonTurtleCommandBlack = "'black'" PythonTurtleCommandBlue = "'blue'" From 750f655b2f362d3de6b38d81a955a560251b555c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 21 Feb 2020 10:44:31 +0100 Subject: [PATCH 2/7] [apps] Move SettingsMessageTree in Shared It is needed in exam_mode_configuration. This way, we can build one app only --- apps/exam_mode_configuration.h | 4 ++-- apps/exam_mode_configuration_non_official.cpp | 2 +- apps/exam_mode_configuration_official.cpp | 2 +- apps/settings/Makefile | 4 ---- apps/settings/main_controller.cpp | 1 + apps/settings/main_controller.h | 20 +++++++++---------- apps/settings/main_controller_prompt_beta.cpp | 2 ++ apps/settings/main_controller_prompt_none.cpp | 2 ++ .../main_controller_prompt_update.cpp | 2 ++ .../sub_menu/generic_sub_controller.h | 2 +- apps/shared/Makefile | 1 + .../settings_message_tree.cpp | 2 +- .../settings_message_tree.h | 6 +++--- 13 files changed, 27 insertions(+), 23 deletions(-) rename apps/{settings => shared}/settings_message_tree.cpp (86%) rename apps/{settings => shared}/settings_message_tree.h (85%) diff --git a/apps/exam_mode_configuration.h b/apps/exam_mode_configuration.h index 4f2879030..600f312d2 100644 --- a/apps/exam_mode_configuration.h +++ b/apps/exam_mode_configuration.h @@ -2,13 +2,13 @@ #define APPS_EXAM_MODE_CONFIGURATION_H #include "global_preferences.h" -#include "settings/settings_message_tree.h" +#include "shared/settings_message_tree.h" #include namespace ExamModeConfiguration { // Settings menu -extern const Settings::SettingsMessageTree s_modelExamChildren[2]; +extern const Shared::SettingsMessageTree s_modelExamChildren[2]; int numberOfAvailableExamMode(); GlobalPreferences::ExamMode examModeAtIndex(int index); I18n::Message examModeActivationMessage(int index); diff --git a/apps/exam_mode_configuration_non_official.cpp b/apps/exam_mode_configuration_non_official.cpp index 2f94ceef7..96255a785 100644 --- a/apps/exam_mode_configuration_non_official.cpp +++ b/apps/exam_mode_configuration_non_official.cpp @@ -1,6 +1,6 @@ #include "exam_mode_configuration.h" -constexpr Settings::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Settings::SettingsMessageTree(I18n::Message::ActivateExamMode), Settings::SettingsMessageTree(I18n::Message::Default)}; +constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::ActivateExamMode), Shared::SettingsMessageTree(I18n::Message::Default)}; int ExamModeConfiguration::numberOfAvailableExamMode() { return 1; diff --git a/apps/exam_mode_configuration_official.cpp b/apps/exam_mode_configuration_official.cpp index 0dbc9434e..860b2f65c 100644 --- a/apps/exam_mode_configuration_official.cpp +++ b/apps/exam_mode_configuration_official.cpp @@ -3,7 +3,7 @@ #include "exam_mode_configuration.h" -constexpr Settings::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[2] = {Settings::SettingsMessageTree(I18n::Message::ActivateExamMode), Settings::SettingsMessageTree(I18n::Message::ActivateDutchExamMode)}; +constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[2] = {Shared::SettingsMessageTree(I18n::Message::ActivateExamMode), Shared::SettingsMessageTree(I18n::Message::ActivateDutchExamMode)}; int ExamModeConfiguration::numberOfAvailableExamMode() { if (GlobalPreferences::sharedGlobalPreferences()->language() != I18n::Language::EN || GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) { diff --git a/apps/settings/Makefile b/apps/settings/Makefile index efe357030..b8197213e 100644 --- a/apps/settings/Makefile +++ b/apps/settings/Makefile @@ -1,10 +1,6 @@ apps += Settings::App app_headers += apps/settings/app.h -app_settings_test_src = $(addprefix apps/settings/,\ - settings_message_tree.cpp \ -) - app_settings_src = $(addprefix apps/settings/,\ app.cpp \ cell_with_separator.cpp \ diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 0d3cdab3b..b5fdd887c 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -4,6 +4,7 @@ #include using namespace Poincare; +using namespace Shared; namespace Settings { diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 9d23249ea..d8a42f975 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -2,7 +2,7 @@ #define SETTINGS_MAIN_CONTROLLER_H #include -#include "settings_message_tree.h" +#include #include "message_table_cell_with_gauge_with_separator.h" #include "sub_menu/about_controller.h" #include "sub_menu/display_mode_controller.h" @@ -12,14 +12,14 @@ namespace Settings { -extern const SettingsMessageTree s_modelAngleChildren[3]; -extern const SettingsMessageTree s_modelEditionModeChildren[2]; -extern const SettingsMessageTree s_modelFloatDisplayModeChildren[4]; -extern const SettingsMessageTree s_modelComplexFormatChildren[3]; -extern const SettingsMessageTree s_modelFontChildren[2]; -extern const SettingsMessageTree s_modelExamChildren[2]; -extern const SettingsMessageTree s_modelAboutChildren[3]; -extern const SettingsMessageTree s_model; +extern const Shared::SettingsMessageTree s_modelAngleChildren[3]; +extern const Shared::SettingsMessageTree s_modelEditionModeChildren[2]; +extern const Shared::SettingsMessageTree s_modelFloatDisplayModeChildren[4]; +extern const Shared::SettingsMessageTree s_modelComplexFormatChildren[3]; +extern const Shared::SettingsMessageTree s_modelFontChildren[2]; +extern const Shared::SettingsMessageTree s_modelExamChildren[2]; +extern const Shared::SettingsMessageTree s_modelAboutChildren[3]; +extern const Shared::SettingsMessageTree s_model; class MainController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource { public: @@ -52,7 +52,7 @@ private: * k_indexOfAboutCell) */ constexpr static int k_indexOfPopUpCell = k_indexOfExamModeCell + 1; constexpr static int k_indexOfAboutCell = k_indexOfExamModeCell + 1; - static const SettingsMessageTree * model(); + static const Shared::SettingsMessageTree * model(); StackViewController * stackController() const; I18n::Message promptMessage() const; bool hasPrompt() const { return promptMessage() != I18n::Message::Default; } diff --git a/apps/settings/main_controller_prompt_beta.cpp b/apps/settings/main_controller_prompt_beta.cpp index 26ecaef81..900c6a22c 100644 --- a/apps/settings/main_controller_prompt_beta.cpp +++ b/apps/settings/main_controller_prompt_beta.cpp @@ -2,6 +2,8 @@ #include "../exam_mode_configuration.h" #include +using namespace Shared; + namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = diff --git a/apps/settings/main_controller_prompt_none.cpp b/apps/settings/main_controller_prompt_none.cpp index a17f0969a..153c7c49a 100644 --- a/apps/settings/main_controller_prompt_none.cpp +++ b/apps/settings/main_controller_prompt_none.cpp @@ -2,6 +2,8 @@ #include "../exam_mode_configuration.h" #include +using namespace Shared; + namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = diff --git a/apps/settings/main_controller_prompt_update.cpp b/apps/settings/main_controller_prompt_update.cpp index 44e08c46e..38f19d3eb 100644 --- a/apps/settings/main_controller_prompt_update.cpp +++ b/apps/settings/main_controller_prompt_update.cpp @@ -4,6 +4,8 @@ namespace Settings { +using namespace Shared; + constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), diff --git a/apps/settings/sub_menu/generic_sub_controller.h b/apps/settings/sub_menu/generic_sub_controller.h index b689f59b2..8c9e42487 100644 --- a/apps/settings/sub_menu/generic_sub_controller.h +++ b/apps/settings/sub_menu/generic_sub_controller.h @@ -2,7 +2,7 @@ #define SETTINGS_GENERIC_SUB_CONTROLLER_H #include -#include "../settings_message_tree.h" +#include namespace Settings { diff --git a/apps/shared/Makefile b/apps/shared/Makefile index e97b68ed0..570afa9bd 100644 --- a/apps/shared/Makefile +++ b/apps/shared/Makefile @@ -59,6 +59,7 @@ app_shared_src = $(addprefix apps/shared/,\ scrollable_two_expressions_cell.cpp \ separable.cpp \ separator_even_odd_buffer_text_cell.cpp \ + settings_message_tree.cpp \ simple_interactive_curve_view_controller.cpp \ store_cell.cpp \ store_controller.cpp \ diff --git a/apps/settings/settings_message_tree.cpp b/apps/shared/settings_message_tree.cpp similarity index 86% rename from apps/settings/settings_message_tree.cpp rename to apps/shared/settings_message_tree.cpp index f481eb543..f7d24b772 100644 --- a/apps/settings/settings_message_tree.cpp +++ b/apps/shared/settings_message_tree.cpp @@ -1,6 +1,6 @@ #include "settings_message_tree.h" -namespace Settings { +namespace Shared { const MessageTree * SettingsMessageTree::children(int index) const { return &m_children[index]; diff --git a/apps/settings/settings_message_tree.h b/apps/shared/settings_message_tree.h similarity index 85% rename from apps/settings/settings_message_tree.h rename to apps/shared/settings_message_tree.h index 10d1b5205..15f7efc7c 100644 --- a/apps/settings/settings_message_tree.h +++ b/apps/shared/settings_message_tree.h @@ -1,9 +1,9 @@ -#ifndef SETTINGS_MESSAGE_TREE_H -#define SETTINGS_MESSAGE_TREE_H +#ifndef SHARED_SETTINGS_MESSAGE_TREE_H +#define SHARED_SETTINGS_MESSAGE_TREE_H #include #include -namespace Settings { +namespace Shared { class SettingsMessageTree : public MessageTree { public: From 0a3ce4cadea6b658c8126fdee1edab7e4681ae0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 21 Feb 2020 10:48:20 +0100 Subject: [PATCH 3/7] [apps/settings_message_tree] Remove .cpp file --- apps/shared/Makefile | 1 - apps/shared/settings_message_tree.cpp | 9 --------- apps/shared/settings_message_tree.h | 12 +++++++----- 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 apps/shared/settings_message_tree.cpp diff --git a/apps/shared/Makefile b/apps/shared/Makefile index 570afa9bd..e97b68ed0 100644 --- a/apps/shared/Makefile +++ b/apps/shared/Makefile @@ -59,7 +59,6 @@ app_shared_src = $(addprefix apps/shared/,\ scrollable_two_expressions_cell.cpp \ separable.cpp \ separator_even_odd_buffer_text_cell.cpp \ - settings_message_tree.cpp \ simple_interactive_curve_view_controller.cpp \ store_cell.cpp \ store_controller.cpp \ diff --git a/apps/shared/settings_message_tree.cpp b/apps/shared/settings_message_tree.cpp deleted file mode 100644 index f7d24b772..000000000 --- a/apps/shared/settings_message_tree.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "settings_message_tree.h" - -namespace Shared { - -const MessageTree * SettingsMessageTree::children(int index) const { - return &m_children[index]; -} - -} diff --git a/apps/shared/settings_message_tree.h b/apps/shared/settings_message_tree.h index 15f7efc7c..f3c3bf364 100644 --- a/apps/shared/settings_message_tree.h +++ b/apps/shared/settings_message_tree.h @@ -1,5 +1,6 @@ #ifndef SHARED_SETTINGS_MESSAGE_TREE_H #define SHARED_SETTINGS_MESSAGE_TREE_H + #include #include @@ -10,15 +11,16 @@ public: constexpr SettingsMessageTree(I18n::Message label = I18n::Message::Default) : MessageTree(label, 0), m_children(nullptr) - { - }; + {} + template constexpr SettingsMessageTree(I18n::Message label, const SettingsMessageTree (&children)[N] = nullptr) : MessageTree(label, N), m_children(children) - { - }; - const MessageTree * children(int index) const override; + {} + + const MessageTree * children(int index) const override { return &m_children[index]; } + private: const SettingsMessageTree * m_children; }; From 8fe41a86734d87463fabc55e472c0574e823e84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 21 Feb 2020 14:29:34 +0100 Subject: [PATCH 4/7] [python/modkandinsky] fillRect accepts negative width and height --- python/port/mod/kandinsky/modkandinsky.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/python/port/mod/kandinsky/modkandinsky.cpp b/python/port/mod/kandinsky/modkandinsky.cpp index c9579236b..27b7ec5b1 100644 --- a/python/port/mod/kandinsky/modkandinsky.cpp +++ b/python/port/mod/kandinsky/modkandinsky.cpp @@ -85,13 +85,21 @@ mp_obj_t modkandinsky_draw_string(size_t n_args, const mp_obj_t * args) { } mp_obj_t modkandinsky_fill_rect(size_t n_args, const mp_obj_t * args) { - KDRect rect( - mp_obj_get_int(args[0]), - mp_obj_get_int(args[1]), - mp_obj_get_int(args[2]), - mp_obj_get_int(args[3]) - ); + mp_int_t x = mp_obj_get_int(args[0]); + mp_int_t y = mp_obj_get_int(args[1]); + mp_int_t width = mp_obj_get_int(args[2]); + mp_int_t height = mp_obj_get_int(args[3]); + if (width < 0) { + width = -width; + x = x - width; + } + if (height < 0) { + height = -height; + y = y - height; + } + KDRect rect(x, y, width, height); KDColor color = ColorForTuple(args[4]); + MicroPython::ExecutionEnvironment::currentExecutionEnvironment()->displaySandbox(); KDIonContext::sharedContext()->fillRect(rect, color); // Cf comment on modkandinsky_draw_string From 686e25ec438e4a1ef55099fb42b7a6532434058d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 21 Feb 2020 16:33:11 +0100 Subject: [PATCH 5/7] [apps/variable_box_controller] Fix expressionLayoutForRecord --- apps/variable_box_controller.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp index 36b9845c3..2d6d09e19 100644 --- a/apps/variable_box_controller.cpp +++ b/apps/variable_box_controller.cpp @@ -236,20 +236,20 @@ Layout VariableBoxController::expressionLayoutForRecord(Storage::Record record, assert(m_firstMemoizedLayoutIndex >= 0); } assert(index >= m_firstMemoizedLayoutIndex && index < m_firstMemoizedLayoutIndex + k_maxNumberOfDisplayedRows); - Layout result; if (m_layouts[index-m_firstMemoizedLayoutIndex].isUninitialized()) { /* Creating the layout of a very long variable might throw a pool exception. * We want to catch it and return a dummy layout instead, otherwise the user * won't be able to open the variable box again, until she deletes the * problematic variable -> and she has no help to remember its name, as she * can't open the variable box. */ + Layout result; Poincare::ExceptionCheckpoint ecp; if (ExceptionRun(ecp)) { result = GlobalContext::LayoutForRecord(record); } + m_layouts[index-m_firstMemoizedLayoutIndex] = result; } - m_layouts[index-m_firstMemoizedLayoutIndex] = result; - return result; + return m_layouts[index-m_firstMemoizedLayoutIndex]; } const char * VariableBoxController::extension() const { From c8537df3b49d7787a6f128bde6d26fae68acf8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 21 Feb 2020 16:36:22 +0100 Subject: [PATCH 6/7] [apps/calc] Do not forget to call parent method Scenario: Open several times the additional outputs menu, there are drawing problems (multiple stack headers) --- .../additional_outputs/expressions_list_controller.cpp | 5 +++-- .../additional_outputs/illustrated_list_controller.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/calculation/additional_outputs/expressions_list_controller.cpp b/apps/calculation/additional_outputs/expressions_list_controller.cpp index be7a5ed36..555de4433 100644 --- a/apps/calculation/additional_outputs/expressions_list_controller.cpp +++ b/apps/calculation/additional_outputs/expressions_list_controller.cpp @@ -25,10 +25,11 @@ int ExpressionsListController::reusableCellCount(int type) { } void ExpressionsListController::viewDidDisappear() { + ListController::viewDidDisappear(); // Reset cell memoization to avoid taking extra space in the pool for (int i = 0; i < k_maxNumberOfCells; i++) { - m_cells[i].setLayout(Layout()); - } + m_cells[i].setLayout(Layout()); + } } HighlightCell * ExpressionsListController::reusableCell(int index, int type) { diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.cpp b/apps/calculation/additional_outputs/illustrated_list_controller.cpp index 53bfeb41c..80ea4f52a 100644 --- a/apps/calculation/additional_outputs/illustrated_list_controller.cpp +++ b/apps/calculation/additional_outputs/illustrated_list_controller.cpp @@ -26,7 +26,7 @@ void IllustratedListController::didEnterResponderChain(Responder * previousFirst } void IllustratedListController::viewDidDisappear() { - StackViewController::viewDidDisappear(); + ListController::viewDidDisappear(); // Reset the context as it was before displaying the IllustratedListController Poincare::Context * context = App::app()->localContext(); if (m_savedExpression.isUninitialized()) { From 1a772506247f5247503fd930c61e535ae1d91888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Sun, 23 Feb 2020 13:43:36 +0100 Subject: [PATCH 7/7] Fix conflicts --- apps/code/catalog.hu.i18n | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/code/catalog.hu.i18n b/apps/code/catalog.hu.i18n index e19a51996..3ff4d4663 100644 --- a/apps/code/catalog.hu.i18n +++ b/apps/code/catalog.hu.i18n @@ -123,7 +123,6 @@ PythonModf = "Az x tört és egész részei" PythonMonotonic = "A monoton óra értéke" PythonOct = "Egész szám konvertálása oktális értékre" PythonPhase = "z fázis" -PythonConstantPi = "3.141592653589794" PythonPolar = "z poláris koordinátákban" PythonPop = "Az utolsó elem eltávolítása és visszaküldése" PythonPower = "x emelve az y teljesítményre"