From a40dcc9af20a2096cdcb01285df6edeadbad2906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 10 May 2017 17:09:22 +0200
Subject: [PATCH] [escher] Correct Metric

Change-Id: Iaef3b5654ba5209eadc2a9726f7206f59df73a32
---
 apps/apps_container.cpp                 | 2 +-
 apps/shared/text_field_delegate_app.cpp | 2 +-
 escher/include/escher/metric.h          | 5 +++--
 escher/src/responder.cpp                | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp
index 04bd40520..6e70e6cd5 100644
--- a/apps/apps_container.cpp
+++ b/apps/apps_container.cpp
@@ -187,7 +187,7 @@ void AppsContainer::refreshPreferences() {
 
 void AppsContainer::displayExamModePopUp(bool activate, bool forceWindowRedraw) {
   m_examPopUpController.setActivatingExamMode(activate);
-  activeApp()->displayModalViewController(&m_examPopUpController, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpRightMargin, Metric::PopUpBottomMargin, Metric::PopUpLeftMargin);
+  activeApp()->displayModalViewController(&m_examPopUpController, 0.f, 0.f, Metric::ExamPopUpTopMargin, Metric::PopUpRightMargin, Metric::ExamPopUpBottomMargin, Metric::PopUpLeftMargin);
   if (forceWindowRedraw) {
     m_window.redraw(true);
   }
diff --git a/apps/shared/text_field_delegate_app.cpp b/apps/shared/text_field_delegate_app.cpp
index c2957ded4..18fdb4c2a 100644
--- a/apps/shared/text_field_delegate_app.cpp
+++ b/apps/shared/text_field_delegate_app.cpp
@@ -51,7 +51,7 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
     AppsContainer * appsContainer = (AppsContainer *)textField->app()->container();
     VariableBoxController * variableBoxController = appsContainer->variableBoxController();
     variableBoxController->setTextFieldCaller(textField);
-    textField->app()->displayModalViewController(variableBoxController, 0.f, 0.f, 50, 50, 0, 50);
+    textField->app()->displayModalViewController(variableBoxController, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
     return true;
   }
   if (event == Ion::Events::XNT) {
diff --git a/escher/include/escher/metric.h b/escher/include/escher/metric.h
index c13f93d13..38fd3d7b9 100644
--- a/escher/include/escher/metric.h
+++ b/escher/include/escher/metric.h
@@ -16,8 +16,9 @@ public:
   constexpr static KDCoordinate ScrollStep = 10;
   constexpr static KDCoordinate PopUpLeftMargin = 40;
   constexpr static KDCoordinate PopUpRightMargin = 40;
-  constexpr static KDCoordinate PopUpTopMargin = 27;
-  constexpr static KDCoordinate PopUpBottomMargin = 55;
+  constexpr static KDCoordinate ExamPopUpTopMargin = 27;
+  constexpr static KDCoordinate ExamPopUpBottomMargin = 55;
+  constexpr static KDCoordinate PopUpTopMargin = 50;
 };
 
 #endif
diff --git a/escher/src/responder.cpp b/escher/src/responder.cpp
index e70855b7c..0d8389b35 100644
--- a/escher/src/responder.cpp
+++ b/escher/src/responder.cpp
@@ -1,6 +1,7 @@
 #include <escher/responder.h>
 #include <escher/app.h>
 #include <escher/toolbox.h>
+#include <escher/metric.h>
 #include <assert.h>
 
 Responder::Responder(Responder * parentResponder) :
@@ -19,7 +20,7 @@ void Responder::setParentResponder(Responder * responder) {
 bool Responder::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::Toolbox && toolbox() != nullptr) {
     toolbox()->setSender(this);
-    app()->displayModalViewController(toolbox(), 0.f, 0.f, 50, 50, 0, 50);
+    app()->displayModalViewController(toolbox(), 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
     return true;
   }
   return false;