UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Change dynamic view controller paradigm

Browse Source 
Change-Id: I57fd41c9b9ad8a1e8b684b97fdf80ddffd71881d
This commit is contained in:
Émilie Feral
2017-05-03 10:26:44 +02:00
parent a1f3c21d9b
commit 70fc734f7b
61 changed files with 338 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
escher/src/stack_view_controller.cpp
View File

@@ -89,7 +89,6 @@ void StackViewController::push(ViewController * vc, KDColor textColor, KDColor b
setupActiveViewController();
if (m_numberOfChildren > 1) {
m_childrenFrame[m_numberOfChildren-2].viewController()->viewDidDisappear();
m_childrenFrame[m_numberOfChildren-2].viewController()->unloadView();
}
}
@@ -98,10 +97,9 @@ void StackViewController::pop() {
assert(m_numberOfChildren > 0);
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
m_numberOfChildren--;
vc->viewDidDisappear();
setupActiveViewController();
vc->setParentResponder(nullptr);
vc->unloadView();
vc->viewDidDisappear();
}
void StackViewController::pushModel(Frame frame) {
@@ -111,7 +109,6 @@ void StackViewController::pushModel(Frame frame) {
void StackViewController::setupActiveViewController() {
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
vc->setParentResponder(this);
vc->loadView();
m_view.setContentView(vc->view());
vc->viewWillAppear();
vc->setParentResponder(this);
@@ -136,8 +133,14 @@ View * StackViewController::view() {
}
void StackViewController::viewWillAppear() {
/* Load the stack view */
for (int i = 0; i < m_numberOfChildren; i++) {
m_view.pushStack(m_childrenFrame[i]);
}
/* Load the visible controller view */
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
if (m_numberOfChildren > 0 && vc) {
m_view.setContentView(vc->view());
vc->viewWillAppear();
}
}
@@ -147,27 +150,7 @@ void StackViewController::viewDidDisappear() {
if (m_numberOfChildren > 0 && vc) {
vc->viewDidDisappear();
}
}
void StackViewController::loadView() {
/* Load the stack view */
for (int i = 0; i < m_numberOfChildren; i++) {
m_view.pushStack(m_childrenFrame[i]);
}
/* Load the visible controller view */
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
if (m_numberOfChildren > 0 && vc) {
vc->loadView();
m_view.setContentView(vc->view());
}
}
void StackViewController::unloadView() {
for (int i = 0; i < m_numberOfChildren; i++) {
m_view.popStack();
}
ViewController * vc = m_childrenFrame[m_numberOfChildren-1].viewController();
if (m_numberOfChildren > 0 && vc) {
vc->unloadView();
}
}