Improve tabbed area and scrolled page.

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java
index 5dd00adf21b23cba56c09ed3718f572f3a7bc435..7e38a2b093bdfe85acb9ced27277cc332b0be116 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java
@@ -18,7 +18,11 @@ public class ScrolledPage extends Composite {
        private ScrolledComposite scrolledComposite;
 
        public ScrolledPage(Composite parent, int style) {
-               super(new ScrolledComposite(parent, SWT.V_SCROLL), style);
+               this(parent, style, false);
+       }
+
+       public ScrolledPage(Composite parent, int style, boolean alwaysShowScroll) {
+               super(createScrolledComposite(parent, alwaysShowScroll), style);
                scrolledComposite = (ScrolledComposite) getParent();
                scrolledComposite.setContent(this);
 
@@ -27,6 +31,12 @@ public class ScrolledPage extends Composite {
                scrolledComposite.addControlListener(new ScrollControlListener());
        }
 
+       private static ScrolledComposite createScrolledComposite(Composite parent, boolean alwaysShowScroll) {
+               ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.V_SCROLL);
+               scrolledComposite.setAlwaysShowScrollBars(alwaysShowScroll);
+               return scrolledComposite;
+       }
+
        @Override
        public void layout(boolean changed, boolean all) {
                updateScroll();
@@ -49,8 +59,7 @@ public class ScrolledPage extends Composite {
                scrolledComposite.setLayoutData(layoutData);
        }
 
-       private class ScrollControlListener extends
-                       org.eclipse.swt.events.ControlAdapter {
+       private class ScrollControlListener extends org.eclipse.swt.events.ControlAdapter {
                private static final long serialVersionUID = -3586986238567483316L;
 
                public void controlResized(ControlEvent e) {

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TabbedArea.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TabbedArea.java
index ab40127d6902d93a3753d6b368857bab6d0f87c4..a9459519aab4bf40ae24a6d2b82df73972616085 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TabbedArea.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/TabbedArea.java
@@ -37,27 +37,37 @@ public class TabbedArea extends Composite {
 
        private String tabStyle;
        private String tabSelectedStyle;
+       private String bodyStyle;
        private Image closeIcon;
 
        public TabbedArea(Composite parent, int style) {
                super(parent, style);
+               CmsUiUtils.style(parent, bodyStyle);
 
                setLayout(CmsUiUtils.noSpaceGridLayout());
 
                // TODO manage tabs at bottom or sides
                headers = new Composite(this, SWT.NONE);
                headers.setLayoutData(CmsUiUtils.fillWidth());
+               // CmsUiUtils.style(headers, bodyStyle);
                body = new Composite(this, SWT.NONE);
                body.setLayoutData(CmsUiUtils.fillAll());
-
                body.setLayout(new FormLayout());
                emptyState();
        }
 
        protected void refreshTabHeaders() {
+               // TODO deal with initialisation better
+//             CmsUiUtils.style(body, bodyStyle);
+
+//             int tabCount = sections.size() > 0 ?(sections.size()>1?sections.size()+1:1)  : 1;
                int tabCount = sections.size() > 0 ? sections.size() : 1;
                for (Control tab : headers.getChildren())
                        tab.dispose();
+
+//             GridLayout headersGridLayout = new GridLayout(tabCount, true);
+//             headersGridLayout.marginHeight=0;
+//             headers.setLayout(headersGridLayout);
                headers.setLayout(CmsUiUtils.noSpaceGridLayout(new GridLayout(tabCount, true)));
 
                if (sections.size() == 0) {
@@ -77,6 +87,7 @@ public class TabbedArea extends Composite {
                        CmsUiUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
                        int headerColumns = 2;
                        sectionHeader.setLayout(new GridLayout(headerColumns, false));
+                       sectionHeader.setLayout(CmsUiUtils.noSpaceGridLayout(headerColumns));
                        Button title = new Button(sectionHeader, SWT.FLAT);
                        CmsUiUtils.style(title, selected ? tabSelectedStyle : tabStyle);
                        title.setLayoutData(CmsUiUtils.fillWidth());
@@ -84,14 +95,23 @@ public class TabbedArea extends Composite {
                        Node node = section.getNode();
                        title.setText(Jcr.getTitle(node));
                        ToolBar toolBar = new ToolBar(sectionHeader, SWT.NONE);
-                       CmsUiUtils.style(toolBar, selected ? tabSelectedStyle : tabStyle);
+//                     CmsUiUtils.style(toolBar, selected ? tabSelectedStyle : tabStyle);
                        ToolItem closeItem = new ToolItem(toolBar, SWT.FLAT);
                        if (closeIcon != null)
                                closeItem.setImage(closeIcon);
                        else
                                closeItem.setText("X");
+                       CmsUiUtils.style(closeItem, selected ? tabSelectedStyle : tabStyle);
                        closeItem.addSelectionListener((Selected) (e) -> closeTab(section));
                }
+
+//             if(sections.size()>1)
+//             {
+//                     ToolBar toolBar = new ToolBar(headers, SWT.NONE);
+//                     CmsUiUtils.style(toolBar, tabStyle);
+//                     ToolItem closeAllItem = new ToolItem(toolBar, SWT.FLAT);
+//                     closeAllItem.setText("X");
+//             }
        }
 
        public void view(CmsUiProvider uiProvider, Node context) {
@@ -161,6 +181,7 @@ public class TabbedArea extends Composite {
        protected void build(Section section, CmsUiProvider uiProvider, Node context) {
                for (Control child : section.getChildren())
                        child.dispose();
+               CmsUiUtils.style(section, bodyStyle);
                section.setNode(context);
                uiProvider.createUiPart(section, context);
 
@@ -211,6 +232,10 @@ public class TabbedArea extends Composite {
                this.tabSelectedStyle = tabSelectedStyle;
        }
 
+       public void setBodyStyle(String bodyStyle) {
+               this.bodyStyle = bodyStyle;
+       }
+
        public void setCloseIcon(Image closeIcon) {
                this.closeIcon = closeIcon;
        }