[poincare] Create a ContextWithParent that implements expressionTypeForIdentifier

This commit is contained in:
Émilie Feral
2020-01-17 14:34:28 +01:00
committed by Léa Saviot
parent c629cb66ba
commit 60048cb9a9
20 changed files with 65 additions and 84 deletions

View File

@@ -1,5 +1,6 @@
#include "app.h"
#include "regression_icon.h"
#include "../apps_container.h"
#include <apps/i18n.h>
using namespace Shared;
@@ -29,7 +30,7 @@ App::Snapshot::Snapshot() :
}
App * App::Snapshot::unpack(Container * container) {
return new (container->currentAppBuffer()) App(this);
return new (container->currentAppBuffer()) App(this, static_cast<AppsContainer *>(container)->globalContext());
}
void App::Snapshot::reset() {
@@ -49,7 +50,7 @@ void App::Snapshot::tidy() {
m_store.tidy();
}
App::App(Snapshot * snapshot) :
App::App(Snapshot * snapshot, Poincare::Context * parentContext) :
TextFieldDelegateApp(snapshot, &m_tabViewController),
m_calculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, snapshot->store()),
m_calculationAlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController),
@@ -58,7 +59,7 @@ App::App(Snapshot * snapshot) :
m_graphAlternateEmptyViewController(&m_graphHeader, &m_graphController, &m_graphController),
m_graphHeader(&m_graphStackViewController, &m_graphAlternateEmptyViewController, &m_graphController),
m_graphStackViewController(&m_tabViewController, &m_graphHeader),
m_storeController(&m_storeHeader, this, snapshot->store(), &m_storeHeader),
m_storeController(&m_storeHeader, this, snapshot->store(), &m_storeHeader, parentContext),
m_storeHeader(&m_storeStackViewController, &m_storeController, &m_storeController),
m_storeStackViewController(&m_tabViewController, &m_storeHeader),
m_tabViewController(&m_modalViewController, snapshot, &m_storeStackViewController, &m_graphStackViewController, &m_calculationHeader),