You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/02/19 13:45:12 UTC
[incubator-hop] branch master updated: HOP-2375: Fix toolbar style
for dark mode
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 5137b95 HOP-2375: Fix toolbar style for dark mode
new e943def Merge pull request #628 from nadment/HOP-2375
5137b95 is described below
commit 5137b9548b488655058b3c389b5c533c747ef4ed
Author: nadment <na...@gmail.com>
AuthorDate: Wed Feb 17 21:04:36 2021 +0100
HOP-2375: Fix toolbar style for dark mode
---
ui/src/main/java/org/apache/hop/ui/core/dialog/ContextDialog.java | 4 +++-
.../org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java | 1 +
.../org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java | 1 +
.../hop/ui/hopgui/perspective/metadata/MetadataPerspective.java | 6 ++++--
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/ContextDialog.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/ContextDialog.java
index f9e69be..ffc85f2 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/ContextDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/ContextDialog.java
@@ -19,6 +19,7 @@ package org.apache.hop.ui.core.dialog;
import org.apache.commons.lang.StringUtils;
import org.apache.hop.core.Const;
+import org.apache.hop.core.Props;
import org.apache.hop.core.SwtUniversalImage;
import org.apache.hop.core.config.HopConfig;
import org.apache.hop.core.gui.AreaOwner;
@@ -362,7 +363,8 @@ public class ContextDialog extends Dialog {
layoutData.right = new FormAttachment(100, 0);
toolBar.setLayoutData(layoutData);
toolBar.pack();
-
+ props.setLook(toolBar, Props.WIDGET_STYLE_TOOLBAR);
+
recallToolbarSettings();
// Add a search bar at the top...
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index 00c719c..8b8c300 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -1839,6 +1839,7 @@ public class HopGuiPipelineGraph extends HopGuiAbstractGraph
layoutData.right = new FormAttachment(100, 0);
toolBar.setLayoutData(layoutData);
toolBar.pack();
+ PropsUi.getInstance().setLook(toolBar, Props.WIDGET_STYLE_TOOLBAR);
// enable / disable the icons in the toolbar too.
//
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
index 0e41e54..e064ab7 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
@@ -1411,6 +1411,7 @@ public class HopGuiWorkflowGraph extends HopGuiAbstractGraph
layoutData.right = new FormAttachment(100, 0);
toolBar.setLayoutData(layoutData);
toolBar.pack();
+ PropsUi.getInstance().setLook(toolBar, Props.WIDGET_STYLE_TOOLBAR);
// enable / disable the icons in the toolbar too.
//
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
index 782c69d..79c8d2a 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/metadata/MetadataPerspective.java
@@ -205,7 +205,8 @@ public class MetadataPerspective implements IHopPerspective {
}
protected void createTree(Composite parent) {
-
+ PropsUi props = PropsUi.getInstance();
+
// Create composite
//
Composite composite = new Composite(parent, SWT.BORDER);
@@ -226,7 +227,8 @@ public class MetadataPerspective implements IHopPerspective {
layoutData.right = new FormAttachment(100, 0);
toolBar.setLayoutData(layoutData);
toolBar.pack();
-
+ props.setLook(toolBar, Props.WIDGET_STYLE_TOOLBAR);
+
tree = new Tree(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
tree.setHeaderVisible(false);
tree.addListener(SWT.Selection, event -> this.updateSelection());