From fa24a4fd547af8b4e040da9e7c494054caf3f5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 27 Dec 2018 11:49:51 +0100 Subject: [PATCH] [apps] Put the Y labels left of the Y axis --- apps/shared/curve_view.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/shared/curve_view.cpp b/apps/shared/curve_view.cpp index 9d60c99f0..604e7a159 100644 --- a/apps/shared/curve_view.cpp +++ b/apps/shared/curve_view.cpp @@ -230,11 +230,11 @@ void CurveView::drawLabels(KDContext * ctx, KDRect rect, Axis axis, bool shiftOr KDSize textSize = k_font->stringSize(labelI); KDPoint origin = KDPointZero; if (-step < x && x < step && shiftOrigin) { - origin = KDPoint(horizontalCoordinate + k_labelMargin, verticalCoordinate + k_labelMargin); + origin = KDPoint(horizontalCoordinate - k_labelMargin - textSize.width(), verticalCoordinate + k_labelMargin); } else { origin = axis == Axis::Horizontal ? KDPoint(std::round(floatToPixel(Axis::Horizontal, x)) - textSize.width()/2, verticalCoordinate + k_labelMargin) : - KDPoint(horizontalCoordinate + k_labelMargin, std::round(floatToPixel(Axis::Vertical, x)) - textSize.height()/2); + KDPoint(horizontalCoordinate - k_labelMargin - textSize.width(), std::round(floatToPixel(Axis::Vertical, x)) - textSize.height()/2); } if (rect.intersects(KDRect(origin, textSize))) { ctx->drawString(labelI, origin, k_font, KDColorBlack);