From a8a1f9ad9c90832c97635dc1bd46e09b052e76ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 24 Apr 2017 17:30:33 +0200
Subject: [PATCH] [escher] Fix bug in layout in modal view controller

Change-Id: Icd1d960db4989faae12212ca254354483df7811f
---
 escher/src/modal_view_controller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp
index a045f27fd..3d37517b8 100644
--- a/escher/src/modal_view_controller.cpp
+++ b/escher/src/modal_view_controller.cpp
@@ -19,7 +19,6 @@ ModalViewController::ContentView::ContentView() :
 void ModalViewController::ContentView::setMainView(View * regularView) {
   if (m_regularView != regularView) {
     m_regularView = regularView;
-    layoutSubviews();
   }
 }
 
@@ -165,6 +164,7 @@ void ModalViewController::loadView() {
   }
   m_regularViewController->loadView();
   m_contentView.setMainView(m_regularViewController->view());
+  m_contentView.layoutSubviews();
 }
 
 void ModalViewController::unloadView() {