From c545a23ec638b67bae9e7f3380bec91afcce6f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 21 Nov 2017 12:16:10 +0100
Subject: [PATCH] [kandinsky] Fix draw rect+change name: drawRect->strokeRect

Change-Id: I1c59e34b126aa54819e399d095499758b9e73125
---
 apps/probability/calculation_controller.cpp | 2 +-
 apps/probability/image_table_view.cpp       | 2 +-
 kandinsky/include/kandinsky/context.h       | 2 +-
 kandinsky/src/context_rect.cpp              | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index be820cc8e..9851e60cf 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -118,7 +118,7 @@ void CalculationController::ContentView::drawRect(KDContext * ctx, KDRect rect)
     numberOfCharacters = strlen(I18n::translate(m_calculation->legendForParameterAtIndex(i)));
     xCoordinate += numberOfCharacters*charSize.width() + k_textWidthMargin;
 
-    ctx->drawRect(KDRect(xCoordinate-ImageTableView::k_outline, titleHeight+ImageTableView::k_margin, textFieldWidth+2*ImageTableView::k_outline, ImageCell::k_height+2*ImageTableView::k_outline), Palette::GreyMiddle);
+    ctx->strokeRect(KDRect(xCoordinate-ImageTableView::k_outline, titleHeight+ImageTableView::k_margin, textFieldWidth+2*ImageTableView::k_outline, ImageCell::k_height+2*ImageTableView::k_outline), Palette::GreyMiddle);
     xCoordinate += textFieldWidth + k_textWidthMargin;
   }
 }
diff --git a/apps/probability/image_table_view.cpp b/apps/probability/image_table_view.cpp
index 1b1bae8f8..56a62317c 100644
--- a/apps/probability/image_table_view.cpp
+++ b/apps/probability/image_table_view.cpp
@@ -59,7 +59,7 @@ ImageTableView::ImageTableView(Responder * parentResponder, Law * law, Calculati
 }
 
 void ImageTableView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->drawRect(KDRect(k_margin, k_margin, ImageCell::k_width+2*k_outline, ImageCell::k_height+2*k_outline), Palette::GreyMiddle);
+  ctx->strokeRect(KDRect(k_margin, k_margin, ImageCell::k_width+2*k_outline, ImageCell::k_height+2*k_outline), Palette::GreyMiddle);
 }
 
 KDSize ImageTableView::minimalSizeForOptimalDisplay() const {
diff --git a/kandinsky/include/kandinsky/context.h b/kandinsky/include/kandinsky/context.h
index f4fab108f..ae44bc67d 100644
--- a/kandinsky/include/kandinsky/context.h
+++ b/kandinsky/include/kandinsky/context.h
@@ -25,7 +25,7 @@ public:
   void fillRect(KDRect rect, KDColor color);
   void fillRectWithPixels(KDRect rect, const KDColor * pixels, KDColor * workingBuffer);
   void blendRectWithMask(KDRect rect, KDColor color, const uint8_t * mask, KDColor * workingBuffer);
-  void drawRect(KDRect rect, KDColor color);
+  void strokeRect(KDRect rect, KDColor color);
 protected:
   KDContext(KDPoint origin, KDRect clippingRect);
   virtual void pushRect(KDRect, const KDColor * pixels) = 0;
diff --git a/kandinsky/src/context_rect.cpp b/kandinsky/src/context_rect.cpp
index 28f5fa3a1..689d1bf61 100644
--- a/kandinsky/src/context_rect.cpp
+++ b/kandinsky/src/context_rect.cpp
@@ -86,16 +86,16 @@ void KDContext::blendRectWithMask(KDRect rect, KDColor color, const uint8_t * ma
   pushRect(absoluteRect, workingBuffer);
 }
 
-void KDContext::drawRect(KDRect rect, KDColor color) {
+void KDContext::strokeRect(KDRect rect, KDColor color) {
   KDPoint p1 = rect.origin();
-  KDPoint p2 = KDPoint(rect.x(), rect.bottom()).translatedBy(KDPoint(1,0));
+  KDPoint p2 = KDPoint(rect.x(), rect.bottom());
   for (int i = 0; i<rect.width(); i++) {
     setPixel(p1, color);
     setPixel(p2, color);
     p1 = p1.translatedBy(KDPoint(1,0));
     p2 = p2.translatedBy(KDPoint(1,0));
   }
-  p1 = rect.origin().translatedBy(KDPoint(0,1));
+  p1 = rect.origin();
   p2 = KDPoint(rect.right(), rect.y());
   for (int i = 0; i<rect.height(); i++) {
     setPixel(p1, color);