[hop] branch master updated: HOP-4155 The layout of the TextVar proposal is broken

[hansva]

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/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e9ee4a9ba HOP-4155 The layout of the TextVar proposal is broken
     new 43170b724d Merge pull request #1650 from nadment/HOP-4155
0e9ee4a9ba is described below

commit 0e9ee4a9bad65c39e3a893e60e182f966879b651
Author: Nicolas Adment <39568358+nadm...@users.noreply.github.com>
AuthorDate: Sun Aug 21 21:28:48 2022 +0200

    HOP-4155 The layout of the TextVar proposal is broken
---
 .../java/org/apache/hop/ui/core/widget/ControlSpaceKeyAdapter.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/ui/src/main/java/org/apache/hop/ui/core/widget/ControlSpaceKeyAdapter.java 
b/ui/src/main/java/org/apache/hop/ui/core/widget/ControlSpaceKeyAdapter.java
index 725ea4267a..139ff58bb7 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/ControlSpaceKeyAdapter.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ControlSpaceKeyAdapter.java
@@ -25,6 +25,7 @@ import org.apache.hop.core.variables.VariableRegistry;
 import org.apache.hop.core.variables.VariableScope;
 import org.apache.hop.core.variables.IVariables;
 import org.apache.hop.i18n.BaseMessages;
+import org.apache.hop.ui.core.FormDataBuilder;
 import org.apache.hop.ui.core.PropsUi;
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.eclipse.swt.SWT;
@@ -32,7 +33,7 @@ import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.*;
 
@@ -128,9 +129,10 @@ public class ControlSpaceKeyAdapter extends KeyAdapter {
       final Shell shell = new Shell(control.getShell(), SWT.NONE);
       shell.setSize(bounds.width > 300 ? bounds.width : 300, 200);
       shell.setLocation(location.x, location.y + bounds.height);
-      shell.setLayout(new FillLayout());
+      shell.setLayout(new FormLayout());
       final List list = new List(shell, SWT.SINGLE | SWT.H_SCROLL | 
SWT.V_SCROLL);
       props.setLook(list);
+      list.setLayoutData(new FormDataBuilder().fullSize().result());
       list.setItems(getVariableNames(variables));
       final Tip toolTip = new Tip(list.getShell(), SWT.BALLOON);
       toolTip.setAutoHide(true);