From bc8b5af2e6136b9074b7b44585ba50b7ef4b2545 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Fri, 19 Jul 2019 14:23:15 +0200
Subject: [PATCH] [escher/modal_view_controller] didBecomeFirstResponder
 selects modal view if displayed

---
 escher/src/modal_view_controller.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp
index bbba5cceb..699d75436 100644
--- a/escher/src/modal_view_controller.cpp
+++ b/escher/src/modal_view_controller.cpp
@@ -136,7 +136,9 @@ void ModalViewController::dismissModalViewController() {
 }
 
 void ModalViewController::didBecomeFirstResponder() {
-  Container::activeApp()->setFirstResponder(m_regularViewController);
+  Container::activeApp()->setFirstResponder(
+    isDisplayingModal() ? m_currentModalViewController : m_regularViewController
+  );
 }
 
 bool ModalViewController::handleEvent(Ion::Events::Event event) {