X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fwidgets%2FEditableImage.java;h=e5f269a40d572ea82e589863562f04089cfd7c84;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=0a327cd512a64e339550a84c832aac0b7d8a224c;hpb=03f646fd0d7e7ce393694c836c779bc67a4eef55;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
index 0a327cd51..e5f269a40 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/EditableImage.java
@@ -5,6 +5,8 @@ import javax.jcr.RepositoryException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.Cms2DSize;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
@@ -17,21 +19,19 @@ public abstract class EditableImage extends StyledControl {
 	private static final long serialVersionUID = -5689145523114022890L;
 	private final static Log log = LogFactory.getLog(EditableImage.class);
 
-	private Point preferredImageSize;
+	private Cms2DSize preferredImageSize;
 	private Boolean loaded = false;
 
 	public EditableImage(Composite parent, int swtStyle) {
 		super(parent, swtStyle);
 	}
 
-	public EditableImage(Composite parent, int swtStyle,
-			Point preferredImageSize) {
+	public EditableImage(Composite parent, int swtStyle, Cms2DSize preferredImageSize) {
 		super(parent, swtStyle);
 		this.preferredImageSize = preferredImageSize;
 	}
 
-	public EditableImage(Composite parent, int style, Node node,
-			boolean cacheImmediately, Point preferredImageSize)
+	public EditableImage(Composite parent, int style, Node node, boolean cacheImmediately, Cms2DSize preferredImageSize)
 			throws RepositoryException {
 		super(parent, style, node, cacheImmediately);
 		this.preferredImageSize = preferredImageSize;
@@ -49,15 +49,15 @@ public abstract class EditableImage extends StyledControl {
 
 	/** To be overriden. */
 	protected String createImgTag() throws RepositoryException {
-		return CmsUiUtils.noImg(preferredImageSize != null ? preferredImageSize
-				: getSize());
+		return CmsUiUtils
+				.noImg(preferredImageSize != null ? preferredImageSize : new Cms2DSize(getSize().x, getSize().y));
 	}
 
 	protected Label createLabel(Composite box, String style) {
 		Label lbl = new Label(box, getStyle());
 		// lbl.setLayoutData(CmsUiUtils.fillWidth());
-		CmsUiUtils.markup(lbl);
-		CmsUiUtils.style(lbl, style);
+		CmsSwtUtils.markup(lbl);
+		CmsSwtUtils.style(lbl, style);
 		if (mouseListener != null)
 			lbl.addMouseListener(mouseListener);
 		load(lbl);
@@ -83,7 +83,8 @@ public abstract class EditableImage extends StyledControl {
 			loaded = true;
 		if (control != null) {
 			((Label) control).setText(imgTag);
-			control.setSize(preferredImageSize != null ? preferredImageSize
+			control.setSize(preferredImageSize != null
+					? new Point(preferredImageSize.getWidth(), preferredImageSize.getHeight())
 					: getSize());
 		} else {
 			loaded = false;
@@ -92,7 +93,7 @@ public abstract class EditableImage extends StyledControl {
 		return loaded;
 	}
 
-	public void setPreferredSize(Point size) {
+	public void setPreferredSize(Cms2DSize size) {
 		this.preferredImageSize = size;
 		if (!loaded) {
 			load((Label) getControl());
@@ -101,11 +102,11 @@ public abstract class EditableImage extends StyledControl {
 
 	protected Text createText(Composite box, String style) {
 		Text text = new Text(box, getStyle());
-		CmsUiUtils.style(text, style);
+		CmsSwtUtils.style(text, style);
 		return text;
 	}
 
-	public Point getPreferredImageSize() {
+	public Cms2DSize getPreferredImageSize() {
 		return preferredImageSize;
 	}