From 2bc1bc268ee45711c078d42b228da5febd00b703 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 6 Feb 2019 22:24:23 +0300
Subject: [PATCH] #4209 Chart grid render fix

Former-commit-id: 79a0e0cfab7040c7924ed92baea3ccc54b749ff4
---
 .../jkiss/dbeaver/ui/dashboard/control/DashboardItem.java    | 4 +++-
 .../ui/dashboard/histogram/DashboardRendererHistogram.java   | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/control/DashboardItem.java b/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/control/DashboardItem.java
index d2ac645f6f..b9da800537 100644
--- a/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/control/DashboardItem.java
+++ b/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/control/DashboardItem.java
@@ -218,7 +218,9 @@ public class DashboardItem extends Composite implements DashboardContainer {
     @Override
     public void updateDashboardData(DashboardDataset dataset) {
         UIUtils.asyncExec(() -> {
-            renderer.updateDashboardData(this, lastUpdateTime, dataset);
+            if (renderer != null) {
+                renderer.updateDashboardData(this, lastUpdateTime, dataset);
+            }
         });
         lastUpdateTime = new Date();
     }
diff --git a/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/histogram/DashboardRendererHistogram.java b/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/histogram/DashboardRendererHistogram.java
index d86bdde75d..ff3c2d4b20 100644
--- a/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/histogram/DashboardRendererHistogram.java
+++ b/plugins/org.jkiss.dbeaver.ui.dashboard/src/org/jkiss/dbeaver/ui/dashboard/histogram/DashboardRendererHistogram.java
@@ -116,7 +116,10 @@ public class DashboardRendererHistogram implements DashboardRenderer {
 
 
         // Set background
-        plot.setBackgroundPaint(AWTUtils.makeAWTColor(composite.getBackground()));
+        plot.setBackgroundPaint(histogramChart.getBackgroundPaint());
+        Color gridColor = AWTUtils.makeAWTColor(UIStyles.getDefaultTextForeground());
+        plot.setDomainGridlinePaint(gridColor);
+        plot.setRangeGridlinePaint(gridColor);
 
         DashboardChartComposite chartComposite = new DashboardChartComposite(container, composite, SWT.NONE, preferredSize);
         chartComposite.setChart(histogramChart);
-- 
GitLab