From 8018cad996f3a0fd85d7aa2d00f03d0fd622d4af Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 14 Nov 2018 14:57:20 +0100 Subject: [PATCH] Improve CMS scripting --- .../src/org/argeo/cms/script/cms.js | 19 ++++++++++++++++++- .../src/org/argeo/cms/util/CmsUtils.java | 4 ++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js b/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js index 117eb9881..af6b2115d 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js +++ b/org.argeo.cms.ui/src/org/argeo/cms/script/cms.js @@ -72,8 +72,25 @@ function newScrolledPage(parent) { var page = new Composite(scrolled, SWT.NONE) page.setLayout(CmsUtils.noSpaceGridLayout()) page.setBackgroundMode(SWT.INHERIT_NONE) - return page } +function gridData(control) { + var gridData = new GridData() + control.setLayoutData(gridData) + return gridData +} + +function gridData(control, hAlign, vAlign, grabHSpace, grabVSpace) { + var gridData = new GridData(hAlign, vAlign, grabHSpace, grabVSpace) + control.setLayoutData(gridData) + return gridData +} + +function gridData(control, width, height) { + var gridData = new GridData(width, height) + control.setLayoutData(gridData) + return gridData +} + // print(__FILE__, __LINE__, __DIR__) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java index 415008966..743691588 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java @@ -84,6 +84,10 @@ public class CmsUtils implements CmsConstants { return noSpaceGridLayout(new GridLayout()); } + public static GridLayout noSpaceGridLayout(int columns) { + return noSpaceGridLayout(new GridLayout(columns, false)); + } + public static GridLayout noSpaceGridLayout(GridLayout layout) { layout.horizontalSpacing = 0; layout.verticalSpacing = 0; -- 2.30.2