X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsUiUtils.java;h=4e5572dbde6f19cf9bb9e84f683b45bd9100ac73;hb=b94bc29e6cb5aa29283a380fdc775ecded7f5734;hp=915b033365d8adab08ab6ab538e088fd946ca183;hpb=ed21871d5963cd7a53c96b23f2e81ec78416001d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 915b03336..4e5572dbd 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -181,18 +181,20 @@ public class CmsUiUtils implements CmsConstants {
 		if (style == null)
 			return widget;// does nothing
 		widget.setData(CmsConstants.STYLE, style);
+		if (widget instanceof Control)
+			CmsView.getCmsView(((Control) widget).getParent()).applyStyles(widget);
 		return widget;
 	}
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, CmsStyle style) {
-		widget.setData(CmsConstants.STYLE, style.toStyleClass());
-		return widget;
+		return style(widget, style.toStyleClass());
 	}
 
 	/** Enable markups on widget */
 	public static <T extends Widget> T markup(T widget) {
-		widget.setData(CmsConstants.MARKUP, true);
+		if (CmsConstants.MARKUP != null)
+			widget.setData(CmsConstants.MARKUP, true);
 		return widget;
 	}
 
@@ -232,6 +234,7 @@ public class CmsUiUtils implements CmsConstants {
 		return text(new Text(parent, SWT.NONE), txt);
 	}
 
+	@Deprecated
 	public static void setItemHeight(Table table, int height) {
 		table.setData(CmsConstants.ITEM_HEIGHT, height);
 	}