From 52cd5a704e2fddf0a9648fd4502e70e60dc790b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 17 Mar 2017 10:30:21 +0100
Subject: [PATCH] [apps/calculation] Improve edit expression rendering

Change-Id: I972d9cf6fd018799966bd8765c6ee35be07aab10
---
 apps/calculation/edit_expression_controller.cpp | 10 +++++++---
 apps/calculation/edit_expression_controller.h   |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/calculation/edit_expression_controller.cpp b/apps/calculation/edit_expression_controller.cpp
index b09818fc3..4a4ba2acf 100644
--- a/apps/calculation/edit_expression_controller.cpp
+++ b/apps/calculation/edit_expression_controller.cpp
@@ -25,10 +25,14 @@ View * EditExpressionController::ContentView::subviewAtIndex(int index) {
 }
 
 void EditExpressionController::ContentView::layoutSubviews() {
-  KDRect mainViewFrame(0, 0, bounds().width(), bounds().height() - k_textFieldHeight);
+  KDRect mainViewFrame(0, 0, bounds().width(), bounds().height() - k_textFieldHeight-k_separatorThickness);
   m_mainView->setFrame(mainViewFrame);
-  KDRect inputViewFram(0, bounds().height() - k_textFieldHeight, bounds().width(), k_textFieldHeight);
-  m_textField.setFrame(inputViewFram);
+  KDRect inputViewFrame(0, bounds().height() - k_textFieldHeight, bounds().width(), k_textFieldHeight);
+  m_textField.setFrame(inputViewFrame);
+}
+
+void  EditExpressionController::ContentView::drawRect(KDContext * ctx, KDRect rect) const {
+  ctx->fillRect(KDRect(0, bounds().height() -k_textFieldHeight-k_separatorThickness, bounds().width(), k_separatorThickness), Palette::GreyMiddle);
 }
 
 TextField * EditExpressionController::ContentView::textField() {
diff --git a/apps/calculation/edit_expression_controller.h b/apps/calculation/edit_expression_controller.h
index 9bdb1cb72..f9276cdcc 100644
--- a/apps/calculation/edit_expression_controller.h
+++ b/apps/calculation/edit_expression_controller.h
@@ -29,8 +29,10 @@ private:
     void layoutSubviews() override;
     TextField * textField();
     TableView * mainView();
+    void drawRect(KDContext * ctx, KDRect rect) const override;
   private:
-    static constexpr KDCoordinate k_textFieldHeight = 20;
+    static constexpr KDCoordinate k_textFieldHeight = 37;
+    constexpr static int k_separatorThickness = 1;
     TableView * m_mainView;
     TextField m_textField;
     char m_textBody[255];