From ffe317867cbdb9e665bd76be3d981ab5ada9ef12 Mon Sep 17 00:00:00 2001 From: jurgen Date: Tue, 18 Aug 2015 17:10:12 +0000 Subject: [PATCH] Folder list items background fix --- .../ui/controls/folders/FolderList.java | 19 ++++++++++++++----- .../dbeaver/ui/editors/sql/SQLEditor.java | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java index 0940b0c337..0e90d786f1 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/folders/FolderList.java @@ -86,8 +86,7 @@ public class FolderList extends Composite { private Color listBackground; private Color hoverGradientStart; private Color hoverGradientEnd; - private Color defaultGradientStart; - private Color defaultGradientEnd; + private Color elementBackground; private Color indentedDefaultBackground; private Color indentedHoverBackground; private Color navigationElementShadowStroke; @@ -203,9 +202,10 @@ public class FolderList extends Composite { e.gc.setBackground(indentedDefaultBackground); e.gc.fillRectangle(0, 2, bounds.width - 1, bounds.height - 1); } else { - e.gc.setForeground(defaultGradientStart); - e.gc.setBackground(defaultGradientEnd); - e.gc.fillGradientRectangle(0, 2, bounds.width - 1, bounds.height - 1, true); + e.gc.setBackground(elementBackground); + e.gc.fillRectangle(0, 2, bounds.width - 1, bounds.height - 1); + //e.gc.setBackground(defaultGradientEnd); + //e.gc.fillGradientRectangle(0, 2, bounds.width - 1, bounds.height - 1, true); } if (!selected) { @@ -750,11 +750,20 @@ public class FolderList extends Composite { * white 20% + INFO_BACKGROUND 60% end colour WIDGET_NORMAL_SHADOW 100% + * INFO_BACKGROUND 40% */ + /* defaultGradientStart = sharedColors.getColor( UIUtils.blend(infoBackground, UIUtils.blend(white, widgetNormalShadow.getRGB(), 20), 60) ); defaultGradientEnd = sharedColors.getColor(UIUtils.blend(infoBackground, widgetNormalShadow.getRGB(), 40)); + */ + if (widgetNormalShadow.hashCode() < widgetBackground.hashCode()) { + // Foreground darker than background - make element background darker + elementBackground = sharedColors.getColor(UIUtils.blend(black, widgetBackground.getRGB(), 15)); + } else { + // Make element background lighter + elementBackground = sharedColors.getColor(UIUtils.blend(white, widgetBackground.getRGB(), 15)); + } navigationElementShadowStroke = sharedColors.getColor(UIUtils.blend(white, widgetNormalShadow.getRGB(), 55)); bottomNavigationElementShadowStroke1 = sharedColors.getColor(UIUtils.blend(black, widgetBackground.getRGB(), 10)); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java index 5932d6d8bb..990e29b6af 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java @@ -1569,7 +1569,7 @@ public class SQLEditor extends SQLEditorBase implements if (outputViewer.isHasNewOutput()) { outputViewer.scrollToEnd(); CTabItem outputItem = UIUtils.getTabItem(resultTabs, outputViewer); - if (outputItem != resultTabs.getSelection()) { + if (outputItem != null && outputItem != resultTabs.getSelection()) { outputItem.setImage(IMG_OUTPUT_ALERT); } } -- GitLab