X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FSimpleErgonomics.java;h=37464079155e3a4097325ae656f5b82d4c024997;hb=f9ee9620626e471a99f25e84175e27380d902957;hp=b7b76e4e686e05bbfc1b91875733abe8cd1dd471;hpb=fd8f2c91e47d38445ba9702b40559939162f666d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java index b7b76e4e6..374640791 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/SimpleErgonomics.java @@ -34,7 +34,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { private final CmsUiProvider uiProvider; private CmsUiProvider header; - private Integer headerHeight = 40; + private Integer headerHeight = 0; private CmsImageManager imageManager = new ImageManagerImpl(); private UxContext uxContext = null; @@ -50,7 +50,9 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); parent.setLayout(CmsUtils.noSpaceGridLayout()); - // createAdminArea(parent); + uxContext = new SimpleUxContext(); + if (!getUxContext().isMasterData()) + createAdminArea(parent); headerArea = new Composite(parent, SWT.NONE); headerArea.setLayout(new FillLayout()); GridData headerData = new GridData(SWT.FILL, SWT.FILL, false, false); @@ -61,7 +63,6 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { bodyArea.setData(RWT.CUSTOM_VARIANT, CmsStyles.CMS_BODY); bodyArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); bodyArea.setLayout(CmsUtils.noSpaceGridLayout()); - uxContext = new SimpleUxContext(); uiInitialized = true; refresh(); } @@ -82,6 +83,9 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint { } protected void refreshHeader() { + if (header == null) + return; + for (Control child : headerArea.getChildren()) child.dispose(); try {