Force layout in layers without entry panes, instead of just requesting

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

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 7004ad01b1ef04e6a9926bf4e7d1aa521bf5fc52..89458552c8916ac8a2e9ff85c514bffcdcf31f1e 100644 (file)
--- 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
@@ -39,7 +39,8 @@ public class DefaultEditionLayer implements SuiteLayer {
                if (entryArea != null) {
                        if (fixedEntryArea) {
                                FixedEditionArea editionArea = new FixedEditionArea(parent, parent.getStyle());
-                               entryArea.createUi(editionArea.getEntryArea(), context);
+                               Control entryAreaC = entryArea.createUi(editionArea.getEntryArea(), context);
+                               CmsUiUtils.style(entryAreaC, SuiteStyle.entryArea);
                                if (this.defaultView != null) {
                                        editionArea.getTabbedArea().view(defaultView, context);
                                }
@@ -70,13 +71,13 @@ 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);
                        }
                }
-               
+
                // tabbed area
                TabbedArea tabbedArea = findTabbedArea(workAreaC);
                if (tabbedArea == null)