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

[escher] Create dynamic view controller

Browse Source 
Change-Id: Ic8fe6d095666aa7af76c8d328b0bf83342a09453
This commit is contained in:
Émilie Feral
2017-04-18 17:03:46 +02:00
parent 097ecc8b89
commit 50aacc79ec
19 changed files with 188 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
escher/src/modal_view_controller.cpp
View File

@@ -17,7 +17,9 @@ ModalViewController::ContentView::ContentView() :
}
void ModalViewController::ContentView::setMainView(View * regularView) {
m_regularView = regularView;
if (m_regularView != regularView) {
m_regularView = regularView;
}
}
int ModalViewController::ContentView::numberOfSubviews() const {
@@ -96,9 +98,6 @@ ModalViewController::ModalViewController(Responder * parentResponder, ViewContro
}
View * ModalViewController::view() {
if (m_contentView.subviewAtIndex(0) == nullptr) {
m_contentView.setMainView(m_regularViewController->view());
}
return &m_contentView;
}
@@ -112,6 +111,7 @@ void ModalViewController::displayModalViewController(ViewController * vc, float
vc->setParentResponder(this);
m_previousResponder = app()->firstResponder();
m_regularViewController->viewDidDisappear();
vc->loadView();
m_contentView.presentModalView(vc->view(), verticalAlignment, horizontalAlignment, topMargin, leftMargin, bottomMargin, rightMargin);
m_currentModalViewController->viewWillAppear();
app()->setFirstResponder(vc);
@@ -119,6 +119,7 @@ void ModalViewController::displayModalViewController(ViewController * vc, float
void ModalViewController::dismissModalViewController() {
m_currentModalViewController->viewDidDisappear();
m_currentModalViewController->unloadView();
m_currentModalViewController = nullptr;
m_regularViewController->viewWillAppear();
app()->setFirstResponder(m_previousResponder);
@@ -156,3 +157,19 @@ void ModalViewController::viewDidDisappear() {
}
m_regularViewController->viewDidDisappear();
}
void ModalViewController::loadView() {
if (m_contentView.isDisplayingModal()) {
m_currentModalViewController->loadView();
}
m_regularViewController->loadView();
m_contentView.setMainView(m_regularViewController->view());
m_contentView.layoutSubviews();
}
void ModalViewController::unloadView() {
if (m_contentView.isDisplayingModal()) {
m_currentModalViewController->unloadView();
}
m_regularViewController->unloadView();
}