From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Jun 2022 10:12:09 +0000 (+0200)
Subject: Change ScrolledPage package
X-Git-Tag: v2.3.10~167
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=24241fea161ffb28b879739bbeb986bdaa30ebd7;p=lgpl%2Fargeo-commons.git

Change ScrolledPage package
---

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java
new file mode 100644
index 000000000..135f4c147
--- /dev/null
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/widgets/ScrolledPage.java
@@ -0,0 +1,74 @@
+package org.argeo.cms.swt.widgets;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * A composite that can be scrolled vertically. It wraps a
+ * {@link ScrolledComposite} (and is being wrapped by it), simplifying its
+ * configuration.
+ */
+public class ScrolledPage extends Composite {
+	private static final long serialVersionUID = 1593536965663574437L;
+
+	private ScrolledComposite scrolledComposite;
+
+	public ScrolledPage(Composite parent, int style) {
+		this(parent, style, false);
+	}
+
+	public ScrolledPage(Composite parent, int style, boolean alwaysShowScroll) {
+		super(createScrolledComposite(parent, alwaysShowScroll), style);
+		scrolledComposite = (ScrolledComposite) getParent();
+		scrolledComposite.setContent(this);
+
+		scrolledComposite.setExpandVertical(true);
+		scrolledComposite.setExpandHorizontal(true);
+		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();
+		super.layout(changed, all);
+	}
+
+	public void showControl(Control control) {
+		scrolledComposite.showControl(control);
+	}
+
+	protected void updateScroll() {
+		Rectangle r = scrolledComposite.getClientArea();
+		Point preferredSize = computeSize(r.width, SWT.DEFAULT);
+		scrolledComposite.setMinHeight(preferredSize.y);
+	}
+
+	// public ScrolledComposite getScrolledComposite() {
+	// return this.scrolledComposite;
+	// }
+
+	/** Set it on the wrapping scrolled composite */
+	@Override
+	public void setLayoutData(Object layoutData) {
+		scrolledComposite.setLayoutData(layoutData);
+	}
+
+	private class ScrollControlListener extends org.eclipse.swt.events.ControlAdapter {
+		private static final long serialVersionUID = -3586986238567483316L;
+
+		public void controlResized(ControlEvent e) {
+			updateScroll();
+		}
+	}
+}
diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
index 1d0c9620a..22e933f45 100644
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/viewers/AbstractPageViewer.java
@@ -13,7 +13,7 @@ import javax.security.auth.Subject;
 
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.ux.CmsEditable;
-import org.argeo.cms.ui.widgets.ScrolledPage;
+import org.argeo.cms.swt.widgets.ScrolledPage;
 import org.argeo.jcr.JcrException;
 import org.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.ISelection;
diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ContextOverlay.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ContextOverlay.java
index 7bc0f79b5..d14eadca2 100644
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ContextOverlay.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ContextOverlay.java
@@ -1,6 +1,7 @@
 package org.argeo.cms.ui.widgets;
 
 import org.argeo.cms.swt.CmsSwtUtils;
+import org.argeo.cms.swt.widgets.ScrolledPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ShellAdapter;
 import org.eclipse.swt.events.ShellEvent;
diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java
deleted file mode 100644
index 517e796e9..000000000
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/ScrolledPage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.argeo.cms.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A composite that can be scrolled vertically. It wraps a
- * {@link ScrolledComposite} (and is being wrapped by it), simplifying its
- * configuration.
- */
-public class ScrolledPage extends Composite {
-	private static final long serialVersionUID = 1593536965663574437L;
-
-	private ScrolledComposite scrolledComposite;
-
-	public ScrolledPage(Composite parent, int style) {
-		this(parent, style, false);
-	}
-
-	public ScrolledPage(Composite parent, int style, boolean alwaysShowScroll) {
-		super(createScrolledComposite(parent, alwaysShowScroll), style);
-		scrolledComposite = (ScrolledComposite) getParent();
-		scrolledComposite.setContent(this);
-
-		scrolledComposite.setExpandVertical(true);
-		scrolledComposite.setExpandHorizontal(true);
-		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();
-		super.layout(changed, all);
-	}
-
-	public void showControl(Control control) {
-		scrolledComposite.showControl(control);
-	}
-
-	protected void updateScroll() {
-		Rectangle r = scrolledComposite.getClientArea();
-		Point preferredSize = computeSize(r.width, SWT.DEFAULT);
-		scrolledComposite.setMinHeight(preferredSize.y);
-	}
-
-	// public ScrolledComposite getScrolledComposite() {
-	// return this.scrolledComposite;
-	// }
-
-	/** Set it on the wrapping scrolled composite */
-	@Override
-	public void setLayoutData(Object layoutData) {
-		scrolledComposite.setLayoutData(layoutData);
-	}
-
-	private class ScrollControlListener extends org.eclipse.swt.events.ControlAdapter {
-		private static final long serialVersionUID = -3586986238567483316L;
-
-		public void controlResized(ControlEvent e) {
-			updateScroll();
-		}
-	}
-}