From 8ec77bbbc20871c77ef7b5b0022fb957677ef8f3 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Fri, 27 Dec 2019 21:26:37 +0300 Subject: [PATCH] Transaction monitor styles fix (dark theme) Former-commit-id: 11d1d336e01cac2733f0cd76cd22c283c5d54fee --- .../dbeaver/ui/controls/txn/TransactionMonitorToolbar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionMonitorToolbar.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionMonitorToolbar.java index ec201f7216..366215be67 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionMonitorToolbar.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/TransactionMonitorToolbar.java @@ -49,6 +49,7 @@ import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor; import org.jkiss.dbeaver.runtime.qm.DefaultExecutionHandler; import org.jkiss.dbeaver.ui.AbstractPartListener; import org.jkiss.dbeaver.ui.IActionConstants; +import org.jkiss.dbeaver.ui.UIStyles; import org.jkiss.dbeaver.ui.UIUtils; import org.jkiss.dbeaver.ui.controls.querylog.QueryLogViewer; @@ -163,6 +164,7 @@ public class TransactionMonitorToolbar { ColorRegistry colorRegistry = workbenchWindow.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(); + Color colorTransaction = colorRegistry.get(QueryLogViewer.COLOR_TRANSACTION); Color colorReverted = colorRegistry.get(QueryLogViewer.COLOR_REVERTED); Color colorCommitted = colorRegistry.get(QueryLogViewer.COLOR_UNCOMMITTED); final RGB COLOR_FULL = colorReverted == null ? getDisplay().getSystemColor(SWT.COLOR_DARK_YELLOW).getRGB() : colorReverted.getRGB(); @@ -171,9 +173,9 @@ public class TransactionMonitorToolbar { final int updateCount = txnState == null ? 0 : txnState.getUpdateCount(); if (txnState == null || !txnState.isTransactionMode()) { - bg = getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND); + bg = UIStyles.getDefaultTextBackground(); } else if (updateCount == 0) { - bg = getDisplay().getSystemColor(SWT.COLOR_WHITE); + bg = colorTransaction; } else { // Use gradient depending on update count ISharedTextColors sharedColors = UIUtils.getSharedTextColors(); -- GitLab