From fd7236246e17d1a811ca2b348e7752161a8df710 Mon Sep 17 00:00:00 2001 From: Miodec Date: Sun, 14 Mar 2021 02:08:49 +0000 Subject: [PATCH] fixed chart color setting --- src/js/chart-controller.js | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/js/chart-controller.js b/src/js/chart-controller.js index 4f9022c93..cdc894ee7 100644 --- a/src/js/chart-controller.js +++ b/src/js/chart-controller.js @@ -631,9 +631,31 @@ export function updateColors(chart) { ThemeColors.update(); } chart.data.datasets[0].borderColor = ThemeColors.main; - chart.data.datasets[0].pointBackgroundColor = ThemeColors.main; chart.data.datasets[1].borderColor = ThemeColors.sub; - chart.data.datasets[1].pointBackgroundColor = ThemeColors.sub; + + if (chart.data.datasets[0].type === undefined) { + if (chart.config.type === "line") { + chart.data.datasets[0].pointBackgroundColor = ThemeColors.main; + } else if (chart.config.type === "bar") { + chart.data.datasets[0].backgroundColor = ThemeColors.main; + } + } else if (chart.data.datasets[0].type === "bar") { + chart.data.datasets[0].backgroundColor = ThemeColors.main; + } else if (chart.data.datasets[0].type === "line") { + chart.data.datasets[0].pointBackgroundColor = ThemeColors.main; + } + + if (chart.data.datasets[1].type === undefined) { + if (chart.config.type === "line") { + chart.data.datasets[1].pointBackgroundColor = ThemeColors.sub; + } else if (chart.config.type === "bar") { + chart.data.datasets[1].backgroundColor = ThemeColors.sub; + } + } else if (chart.data.datasets[1].type === "bar") { + chart.data.datasets[1].backgroundColor = ThemeColors.sub; + } else if (chart.data.datasets[1].type === "line") { + chart.data.datasets[1].pointBackgroundColor = ThemeColors.sub; + } try { chart.options.scales.xAxes[0].ticks.minor.fontColor = ThemeColors.sub; @@ -654,6 +676,12 @@ export function updateColors(chart) { chart.options.scales.yAxes[2].ticks.minor.fontColor = ThemeColors.sub; chart.options.scales.yAxes[2].scaleLabel.fontColor = ThemeColors.sub; } catch {} + + try { + chart.data.datasets[0].trendlineLinear.style = ThemeColors.sub; + chart.data.datasets[1].trendlineLinear.style = ThemeColors.sub; + } catch {} + chart.update(); }