[escher] Only one app is on the heap at one time

Change-Id: I6c77601cb0cc883083a4dd05370ca543fa7951cc
This commit is contained in:
Émilie Feral
2017-05-16 17:02:06 +02:00
parent e9b2717b17
commit 06de0dd9db
38 changed files with 414 additions and 212 deletions

View File

@@ -4,19 +4,33 @@ extern "C" {
#include <assert.h>
}
App::App(Container * container, ViewController * rootViewController, I18n::Message name, I18n::Message upperName, const Image * icon, I18n::Message warningMessage) :
I18n::Message App::Descriptor::name() {
return (I18n::Message)0;
}
I18n::Message App::Descriptor::upperName() {
return (I18n::Message)0;
}
const Image * App::Descriptor::icon() {
return nullptr;
}
App::App(Container * container, ViewController * rootViewController, Descriptor * descriptor, I18n::Message warningMessage) :
Responder(nullptr),
m_magic(Magic),
m_modalViewController(this, rootViewController),
m_descriptor(descriptor),
m_container(container),
m_firstResponder(nullptr),
m_warningController(this, warningMessage),
m_name(name),
m_upperName(upperName),
m_icon(icon)
m_warningController(this, warningMessage)
{
}
App::Descriptor * App::descriptor() {
return m_descriptor;
}
bool App::processEvent(Ion::Events::Event event) {
Responder * responder = m_firstResponder;
bool didHandleEvent = false;
@@ -57,18 +71,6 @@ void App::setFirstResponder(Responder * responder) {
}
}
I18n::Message App::name() {
return m_name;
}
I18n::Message App::upperName() {
return m_upperName;
}
const Image * App::icon() {
return m_icon;
}
void App::displayModalViewController(ViewController * vc, float verticalAlignment, float horizontalAlignment,
KDCoordinate topMargin, KDCoordinate leftMargin, KDCoordinate bottomMargin, KDCoordinate rightMargin) {
if (m_modalViewController.isDisplayingModal()) {