From 9f09ee8339d1bb6e7c2c2a93eb3b70fca450fc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Wed, 25 Apr 2018 09:48:49 +0200
Subject: [PATCH] [escher] Remove big modal view drawing hack.

Change-Id: I09b0d9ee1db8db9a736577770f540e69cc78d660
---
 escher/src/modal_view_controller.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp
index dd45202c0..d589d061d 100644
--- a/escher/src/modal_view_controller.cpp
+++ b/escher/src/modal_view_controller.cpp
@@ -23,18 +23,12 @@ void ModalViewController::ContentView::setMainView(View * regularView) {
 }
 
 int ModalViewController::ContentView::numberOfSubviews() const {
-  KDRect regularFrame = bounds();
-  KDRect modalFrame = modalViewFrame();
-  bool shouldDrawTheRegularViewBehind = !modalFrame.contains(regularFrame.topLeft()) || !modalFrame.contains(regularFrame.bottomRight());
-  return 1 + (m_isDisplayingModal && shouldDrawTheRegularViewBehind);
+  return 1 + m_isDisplayingModal;
 }
 
 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) {