Introduce bearing node type.

[gpl/argeo-suite.git] / org.argeo.suite.ui / src / org / argeo / suite / ui / SuiteUiUtils.java

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
index c98e6d64c800c677fb7ceaabd38b083ef9fd06fb..085dd4f099eace84f6556bc1ff37cea191e13e32 100644 (file)
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
@@ -244,8 +244,12 @@ public class SuiteUiUtils {
                Label img = new Label(parent, SWT.NONE);
                CmsUiUtils.markup(img);
                img.setText(CmsUiUtils.img(fileNode, width.toString(), height.toString()));
                Label img = new Label(parent, SWT.NONE);
                CmsUiUtils.markup(img);
                img.setText(CmsUiUtils.img(fileNode, width.toString(), height.toString()));

-               if (parent.getLayout() instanceof GridLayout)
-                       img.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+               if (parent.getLayout() instanceof GridLayout) {
+                       GridData gd = new GridData(SWT.CENTER, SWT.CENTER, false, false);
+                       gd.widthHint = width.intValue();
+                       gd.heightHint = height.intValue();
+                       img.setLayoutData(gd);
+               }

                img.addMouseListener(new MouseListener() {
 
                        @Override
                img.addMouseListener(new MouseListener() {
 
                        @Override


@@ -268,7 +272,7 @@ public class SuiteUiUtils {
                                                scroll.setLayout(CmsUiUtils.noSpaceGridLayout());
                                                scroll.setExpandHorizontal(true);
                                                scroll.setExpandVertical(true);
                                                scroll.setLayout(CmsUiUtils.noSpaceGridLayout());
                                                scroll.setExpandHorizontal(true);
                                                scroll.setExpandVertical(true);

-                                               //scroll.setAlwaysShowScrollBars(true);
+                                               // scroll.setAlwaysShowScrollBars(true);

 
                                                Composite c = new Composite(scroll, SWT.NONE);
                                                scroll.setContent(c);
 
                                                Composite c = new Composite(scroll, SWT.NONE);
                                                scroll.setContent(c);