From e4ec398ecd65807d5d425f3e0f69a1221275ee26 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Thu, 6 Jun 2019 14:04:47 +0200
Subject: [PATCH] [escher] InputEventHandler gets the app directly

---
 escher/include/escher/input_event_handler.h | 5 ++---
 escher/src/input_event_handler.cpp          | 4 ++--
 escher/src/layout_field.cpp                 | 2 +-
 escher/src/text_area.cpp                    | 3 +--
 escher/src/text_field.cpp                   | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/escher/include/escher/input_event_handler.h b/escher/include/escher/input_event_handler.h
index b413eef6d..c033e1055 100644
--- a/escher/include/escher/input_event_handler.h
+++ b/escher/include/escher/input_event_handler.h
@@ -1,17 +1,16 @@
 #ifndef ESCHER_INPUT_EVENT_HANDLER_H
 #define ESCHER_INPUT_EVENT_HANDLER_H
 
-#include <ion.h>
+#include <ion/events.h>
 
 class InputEventHandlerDelegate;
-class App;
 
 class InputEventHandler {
 public:
   InputEventHandler(InputEventHandlerDelegate * inputEventHandlerdelegate) : m_inputEventHandlerDelegate(inputEventHandlerdelegate) {}
   virtual bool handleEventWithText(const char * text, bool indentation = false, bool forceCursorRightOfText = false) { return false; }
 protected:
-  bool handleBoxEvent(App * app, Ion::Events::Event event);
+  bool handleBoxEvent(Ion::Events::Event event);
   InputEventHandlerDelegate * m_inputEventHandlerDelegate;
 };
 
diff --git a/escher/src/input_event_handler.cpp b/escher/src/input_event_handler.cpp
index aa2f2a0af..c99fc6524 100644
--- a/escher/src/input_event_handler.cpp
+++ b/escher/src/input_event_handler.cpp
@@ -4,7 +4,7 @@
 #include <escher/toolbox.h>
 #include <escher/metric.h>
 
-bool InputEventHandler::handleBoxEvent(App * app, Ion::Events::Event event) {
+bool InputEventHandler::handleBoxEvent(Ion::Events::Event event) {
   NestedMenuController * box = nullptr;
   if (m_inputEventHandlerDelegate) {
     box = event == Ion::Events::Toolbox ? m_inputEventHandlerDelegate->toolboxForInputEventHandler(this) : box;
@@ -12,7 +12,7 @@ bool InputEventHandler::handleBoxEvent(App * app, Ion::Events::Event event) {
   }
   if (box) {
     box->setSender(this);
-    app->displayModalViewController(box, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
+    app()->displayModalViewController(box, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
     return true;
   }
   return false;
diff --git a/escher/src/layout_field.cpp b/escher/src/layout_field.cpp
index b691b73b8..0e5d44da3 100644
--- a/escher/src/layout_field.cpp
+++ b/escher/src/layout_field.cpp
@@ -174,7 +174,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
   if (m_delegate && m_delegate->layoutFieldDidReceiveEvent(this, event)) {
     return true;
   }
-  if (handleBoxEvent(app(), event)) {
+  if (handleBoxEvent(event)) {
     if (!isEditing()) {
       setEditing(true);
     }
diff --git a/escher/src/text_area.cpp b/escher/src/text_area.cpp
index 4683f121d..89b4abde2 100644
--- a/escher/src/text_area.cpp
+++ b/escher/src/text_area.cpp
@@ -1,4 +1,3 @@
-#include <escher/app.h>
 #include <escher/text_area.h>
 #include <escher/clipboard.h>
 #include <escher/text_input_helpers.h>
@@ -97,7 +96,7 @@ bool TextArea::handleEventWithText(const char * text, bool indentation, bool for
 bool TextArea::handleEvent(Ion::Events::Event event) {
   if (m_delegate != nullptr && m_delegate->textAreaDidReceiveEvent(this, event)) {
     return true;
-  } else if (handleBoxEvent(app(), event)) {
+  } else if (handleBoxEvent(event)) {
     return true;
   } else if (event == Ion::Events::Left) {
     return TextInput::moveCursorLeft();
diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index 09d2531ad..d85ce90de 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -1,4 +1,3 @@
-#include <escher/app.h>
 #include <escher/text_field.h>
 #include <escher/text_input_helpers.h>
 #include <escher/clipboard.h>
@@ -278,7 +277,7 @@ void TextField::setEditing(bool isEditing, bool reinitDrafBuffer) {
 
 bool TextField::privateHandleEvent(Ion::Events::Event event) {
   // Handle Toolbox or Var event
-  if (handleBoxEvent(app(), event)) {
+  if (handleBoxEvent(event)) {
     if (!isEditing()) {
       setEditing(true);
     }