From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 4 Sep 2021 04:25:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.23~2
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=e23829c4df951a7480e958fb24c5ef3ca0afd4b3;hp=0346615633181e04be0bdac3dfb13e26cce0976f

Merge remote-tracking branch 'origin/master' into v2.x
---

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
index 92a9dea..8945855 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
@@ -71,7 +71,7 @@ public class DefaultEditionLayer implements SuiteLayer {
 			try {
 				CmsUiUtils.clear(workAreaC);
 				workArea.createUi(workAreaC, context);
-				workAreaC.requestLayout();
+				workAreaC.layout(true, true);
 				return;
 			} catch (RepositoryException e) {
 				throw new JcrException("Cannot rebuild work area", e);
diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index 5ca4639..9a6208b 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -343,16 +343,11 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 					ui.getCmsView().stateChanged(state, appTitle);
 					return;
 				}
-				String currentLayerId = ui.getCurrentLayerId();
-//				if (state.equals(currentLayerId))
-//					return; // does nothing
-//				else {
 				Map<String, Object> properties = new HashMap<>();
 				String layerId = HOME_STATE.equals(state) ? defaultLayerPid : state;
 				properties.put(SuiteEvent.LAYER, layerId);
 				properties.put(SuiteEvent.NODE_PATH, HOME_STATE);
 				ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
-//				}
 			}
 			return;
 		}