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

[escher] In modal view controller, draw the regular view only if the

Browse Source 
modal view does not cover all of it

Change-Id: I0eedcb881fa30ffad83cd371e59908810b4e179f
This commit is contained in:
Émilie Feral
2017-08-10 10:56:07 +02:00
parent 7f6ee28f4e
commit 587406bccd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
escher/src/modal_view_controller.cpp
View File

@@ -23,15 +23,16 @@ void ModalViewController::ContentView::setMainView(View * regularView) {
}
int ModalViewController::ContentView::numberOfSubviews() const {
if (m_isDisplayingModal) {
return 2;
}
return 1;
bool shouldDrawTheRegularViewBehind = m_topMargin != 0 || m_leftMargin != 0 || m_bottomMargin != 0 || m_rightMargin != 0;
return 1 + (m_isDisplayingModal && shouldDrawTheRegularViewBehind);
}
View * ModalViewController::ContentView::subviewAtIndex(int index) {
switch (index) {
case 0:
if (m_isDisplayingModal && numberOfSubviews() == 1) {
return m_currentModalView;
}
return m_regularView;
case 1:
if (numberOfSubviews() == 2) {
@@ -59,8 +60,8 @@ KDRect ModalViewController::ContentView::frame() {
void ModalViewController::ContentView::layoutSubviews() {
assert(m_regularView != nullptr);
m_regularView->setFrame(bounds());
if (numberOfSubviews() == 2) {
assert(m_currentModalView != nullptr);
if (m_isDisplayingModal) {
assert(m_currentModalView != nullptr);
m_currentModalView->setFrame(frame());
}
}