From 298bf1a538f8354673a7e851770cd89dfde75c20 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Thu, 18 Mar 2021 22:16:26 -0500 Subject: [PATCH] BarChart: Fix small bars --- .../org/isoron/uhabits/core/ui/views/BarChart.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt index ca8e700ad..9e0c8d1d9 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt @@ -90,10 +90,14 @@ class BarChart( val y = height - footerHeight - barHeight canvas.setColor(colors[s]) val r = round(barWidth * 0.15) - canvas.fillRect(x, y + r, barWidth, barHeight - r) - canvas.fillRect(x + r, y, barWidth - 2 * r, r) - canvas.fillCircle(x + r, y + r, r) - canvas.fillCircle(x + barWidth - r, y + r, r) + if (2 * r < barHeight) { + canvas.fillRect(x, y + r, barWidth, barHeight - r) + canvas.fillRect(x + r, y, barWidth - 2 * r, r) + canvas.fillCircle(x + r, y + r, r) + canvas.fillCircle(x + barWidth - r, y + r, r) + } else { + canvas.fillRect(x, y, barWidth, barHeight) + } canvas.setFontSize(theme.smallTextSize) canvas.setTextAlign(TextAlign.CENTER) canvas.setColor(colors[s])