From 54c28fc87f22abf8a734952c9af25ce7092c9a58 Mon Sep 17 00:00:00 2001 From: Gabriel Ozouf Date: Fri, 25 Sep 2020 11:13:12 +0200 Subject: [PATCH] [escher/modal_view_controller] Hide regular view Do not display the regular view when the main view takes up all the frame. This fixes a bug causing the language menu to be briefly visible before the logo on start-up. Change-Id: Ia2de44de52ac6f852e0eca05101587042f02913b --- escher/src/modal_view_controller.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp index 6fbed78b1..548f29a05 100644 --- a/escher/src/modal_view_controller.cpp +++ b/escher/src/modal_view_controller.cpp @@ -56,11 +56,13 @@ KDRect ModalViewController::ContentView::modalViewFrame() const { void ModalViewController::ContentView::layoutSubviews(bool force) { assert(m_regularView != nullptr); - m_regularView->setFrame(bounds(), force); if (m_isDisplayingModal) { assert(m_currentModalView != nullptr); - m_currentModalView->setFrame(modalViewFrame(), force); + KDRect modalFrame = modalViewFrame(); + m_regularView->setFrame(modalFrame == bounds() ? KDRectZero : bounds(), force); + m_currentModalView->setFrame(modalFrame, force); } else { + m_regularView->setFrame(bounds(), force); if (m_currentModalView) { m_currentModalView->setFrame(KDRectZero, force); }