[incubator-hop] branch master updated: HOP-3041 StyledTextComp doesn't display variable icon properly

[ha...@apache.org]

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 41485ad  HOP-3041 StyledTextComp doesn't display variable icon properly
     new 3120414  Merge pull request #927 from nadment/HOP-3041
41485ad is described below

commit 41485ad9189efb9fe7dfed6b18eae775c068e95c
Author: nadment <na...@gmail.com>
AuthorDate: Sun Jul 11 18:54:32 2021 +0200

    HOP-3041 StyledTextComp doesn't display variable icon properly
---
 .../transforms/tableinput/TableInputDialog.java         |  5 -----
 .../org/apache/hop/ui/core/widget/StyledTextComp.java   | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java b/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java
index 08669c9..b691d90 100644
--- a/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java
+++ b/plugins/transforms/tableinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.Props;
 import org.apache.hop.core.database.Database;
 import org.apache.hop.core.database.DatabaseMeta;
 import org.apache.hop.core.exception.HopException;
-import org.apache.hop.core.plugins.IPlugin;
 import org.apache.hop.core.row.IRowMeta;
 import org.apache.hop.core.row.IValueMeta;
 import org.apache.hop.core.util.Utils;
@@ -35,7 +34,6 @@ import org.apache.hop.pipeline.transform.BaseTransformMeta;
 import org.apache.hop.pipeline.transform.ITransformDialog;
 import org.apache.hop.pipeline.transform.TransformMeta;
 import org.apache.hop.pipeline.transform.errorhandling.IStream;
-import org.apache.hop.pipeline.transforms.tableinput.TableInputMeta;
 import org.apache.hop.ui.core.database.dialog.DatabaseExplorerDialog;
 import org.apache.hop.ui.core.dialog.BaseDialog;
 import org.apache.hop.ui.core.dialog.EnterNumberDialog;
@@ -58,15 +56,12 @@ import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.ShellAdapter;
 import org.eclipse.swt.events.ShellEvent;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
index 08356ad..44c823f 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/StyledTextComp.java
@@ -18,7 +18,6 @@
 package org.apache.hop.ui.core.widget;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.hop.core.Const;
 import org.apache.hop.core.variables.IVariables;
 import org.apache.hop.i18n.BaseMessages;
 import org.apache.hop.ui.core.FormDataBuilder;
@@ -34,7 +33,6 @@ import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -72,7 +70,8 @@ public class StyledTextComp extends Composite {
     textWidget = new Text(this, args);
     styledTextPopupmenu = new Menu(parent.getShell(), SWT.POP_UP);
     xParent = parent;
-    this.setLayout(variableIconOnTop ? new FormLayout() : new FillLayout());
+    this.setLayout(new FormLayout());  
+    
     buildingStyledTextMenu();
 
     if (varsSensitive) {
@@ -92,16 +91,20 @@ public class StyledTextComp extends Composite {
                 .bottom(100, 0)
                 .result());
       } else {
-        Label controlDecoration = new Label(parent, SWT.NONE);
+        Label controlDecoration = new Label(this, SWT.NONE);
         controlDecoration.setImage(image);
         controlDecoration.setToolTipText(
             BaseMessages.getString(PKG, "StyledTextComp.tooltip.InsertVariable"));
         PropsUi.getInstance().setLook(controlDecoration);
-        controlDecoration.setLayoutData(
+        controlDecoration.setLayoutData(new FormDataBuilder().top().right(100, 0).result());
+        textWidget.setLayoutData(
             new FormDataBuilder()
-                .top(new FormAttachment(textWidget, 0, SWT.TOP))
-                .left(new FormAttachment(textWidget, Const.MARGIN, SWT.RIGHT))
+                .top()
+                .left()
+                .right(new FormAttachment(controlDecoration, 0, 0))
+                .bottom(100, 0)
                 .result());
+
       }
     }
   }