From 283ee4118c8ad50919a0e4fb32419940780b37c9 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Feb 2021 11:33:03 +0100
Subject: [PATCH] Use stack layout for tabbed area.

---
 .../argeo/suite/ui/widgets/TabbedArea.java    | 53 +++++++++++++------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
index 63de5ff..cd0e3cd 100644
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
@@ -11,8 +11,8 @@ import org.argeo.cms.ui.viewers.Section;
 import org.argeo.eclipse.ui.Selected;
 import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -40,6 +40,10 @@ public class TabbedArea extends Composite {
 	private String bodyStyle;
 	private Image closeIcon;
 
+	private StackLayout stackLayout;
+
+	private boolean singleTab = false;
+
 	public TabbedArea(Composite parent, int style) {
 		super(parent, style);
 		CmsUiUtils.style(parent, bodyStyle);
@@ -51,7 +55,9 @@ public class TabbedArea extends Composite {
 		headers.setLayoutData(CmsUiUtils.fillWidth());
 		body = new Composite(this, SWT.NONE);
 		body.setLayoutData(CmsUiUtils.fillAll());
-		body.setLayout(new FormLayout());
+		// body.setLayout(new FormLayout());
+		stackLayout = new StackLayout();
+		body.setLayout(stackLayout);
 		emptyState();
 	}
 
@@ -77,7 +83,7 @@ public class TabbedArea extends Composite {
 			boolean selected = section == currentSection;
 			Composite sectionHeader = section.createHeader(headers);
 			CmsUiUtils.style(sectionHeader, selected ? tabSelectedStyle : tabStyle);
-			int headerColumns = 2;
+			int headerColumns = singleTab ? 1 : 2;
 			sectionHeader.setLayout(new GridLayout(headerColumns, false));
 			sectionHeader.setLayout(CmsUiUtils.noSpaceGridLayout(headerColumns));
 			Button title = new Button(sectionHeader, SWT.FLAT);
@@ -86,14 +92,16 @@ public class TabbedArea extends Composite {
 			title.addSelectionListener((Selected) (e) -> showTab(tabIndex(section.getNode())));
 			Node node = section.getNode();
 			title.setText(Jcr.getTitle(node));
-			ToolBar toolBar = new ToolBar(sectionHeader, SWT.NONE);
-			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 (!singleTab) {
+				ToolBar toolBar = new ToolBar(sectionHeader, SWT.NONE);
+				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));
+			}
 		}
 
 	}
@@ -118,15 +126,20 @@ public class TabbedArea extends Composite {
 		}
 		currentUiProvider = uiProvider;
 		section.setNode(context);
-		section.setLayoutData(CmsUiUtils.coverAll());
+		// section.setLayoutData(CmsUiUtils.coverAll());
 		build(section, uiProvider, context);
 		if (sections.size() == 0)
 			sections.add(section);
 		refreshTabHeaders();
+		index = tabIndex(context);
+		showTab(index);
 		layout(true, true);
 	}
 
 	public void open(CmsUiProvider uiProvider, Node context) {
+		if (singleTab)
+			throw new UnsupportedOperationException("Open is not supported in single tab mode.");
+
 		if (previousNode != null && Jcr.getIdentifier(previousNode).equals(Jcr.getIdentifier(context))) {
 			// does nothing
 			return;
@@ -137,15 +150,18 @@ public class TabbedArea extends Composite {
 		int currentIndex = sections.indexOf(currentSection);
 		Section previousSection = new Section(body, SWT.NONE, context);
 		build(previousSection, previousUiProvider, previousNode);
-		previousSection.setLayoutData(CmsUiUtils.coverAll());
-		sections.add(currentIndex + 1, previousSection);
+		// previousSection.setLayoutData(CmsUiUtils.coverAll());
+		int index = currentIndex + 1;
+		sections.add(index, previousSection);
+		showTab(index);
 		refreshTabHeaders();
 		layout(true, true);
 	}
-	
+
 	public void showTab(int index) {
 		Section sectionToShow = sections.get(index);
-		sectionToShow.moveAbove(null);
+		// sectionToShow.moveAbove(null);
+		stackLayout.topControl = sectionToShow;
 		refreshTabHeaders();
 		layout(true, true);
 	}
@@ -211,4 +227,9 @@ public class TabbedArea extends Composite {
 	public void setCloseIcon(Image closeIcon) {
 		this.closeIcon = closeIcon;
 	}
+
+	public void setSingleTab(boolean singleTab) {
+		this.singleTab = singleTab;
+	}
+
 }
-- 
2.30.2