projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve single sourcing.
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui
/
src
/
org
/
argeo
/
cms
/
ui
/
util
/
CmsUiUtils.java
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 915b033365d8adab08ab6ab538e088fd946ca183..4e5572dbde6f19cf9bb9e84f683b45bd9100ac73 100644
(file)
--- 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 (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) {
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) {
}
/** 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;
}
return widget;
}
@@
-232,6
+234,7
@@
public class CmsUiUtils implements CmsConstants {
return text(new Text(parent, SWT.NONE), txt);
}
return text(new Text(parent, SWT.NONE), txt);
}
+ @Deprecated
public static void setItemHeight(Table table, int height) {
table.setData(CmsConstants.ITEM_HEIGHT, height);
}
public static void setItemHeight(Table table, int height) {
table.setData(CmsConstants.ITEM_HEIGHT, height);
}