X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteUi.java;h=ae278157f85f63de84ea03a110bfe20174fd9043;hp=d93c3a8b38eb54de555474f13853e6d72646b28b;hb=9cfd54a608937b5373c6ac880a9874aa542bb2a1;hpb=377d822958ec57c8fe39716d8af129c3ff258eaf

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
index d93c3a8..ae27815 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
@@ -43,6 +43,7 @@ class SuiteUi extends Composite {
 		this.setLayout(CmsUiUtils.noSpaceGridLayout());
 
 		header = new Composite(this, SWT.NONE);
+		header.setLayout(CmsUiUtils.noSpaceGridLayout());
 		CmsUiUtils.style(header, SuiteStyle.header);
 		header.setLayoutData(CmsUiUtils.fillWidth());
 
@@ -64,9 +65,10 @@ class SuiteUi extends Composite {
 				dynamicArea = new Composite(belowHeader, SWT.NONE);
 			}
 			leadPane.setLayoutData(CmsUiUtils.fillHeight());
+			leadPane.setLayout(CmsUiUtils.noSpaceGridLayout());
 			CmsUiUtils.style(leadPane, SuiteStyle.leadPane);
-			dynamicArea.setLayoutData(CmsUiUtils.fillAll());
 
+			dynamicArea.setLayoutData(CmsUiUtils.fillAll());
 			dynamicArea.setLayout(new FormLayout());
 
 		} else {
@@ -110,14 +112,18 @@ class SuiteUi extends Composite {
 		Composite toShow = getLayer(layerId, context);
 		if (toShow != null) {
 			currentLayerId = layerId;
-			if (!isDisposed())
-				getDisplay().syncExec(() -> {
-					if (!toShow.isDisposed())
-						toShow.moveAbove(null);
-					else
-						log.warn("Cannot show work area because it is disposed.");
-					dynamicArea.layout(true, true);
-				});
+			if (!isDisposed()) {
+//				getDisplay().syncExec(() -> {
+				if (!toShow.isDisposed()) {
+					toShow.moveAbove(null);
+				} else {
+					log.warn("Cannot show work area because it is disposed.");
+					toShow = initLayer(layerId, layers.get(layerId), context);
+					toShow.moveAbove(null);
+				}
+				dynamicArea.layout(true, true);
+//				});
+			}
 			return toShow;
 		} else {
 			return current;