X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2FCmsTheme.java;h=4b3d186f7ae47cb3e2059befb3bd7376b781d595;hb=fea7cd546f9c04c00f961918919dd6307c32cc8e;hp=37f52a35e5e40722224697f370f1bd2f63231c46;hpb=1233dcea2383bfe5c83e5ec33d0c502afff22601;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsTheme.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsTheme.java
index 37f52a35e..4b3d186f7 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsTheme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/CmsTheme.java
@@ -19,9 +19,15 @@ public interface CmsTheme {
 	 */
 	InputStream getResourceAsStream(String resourceName) throws IOException;
 
+	/** Relative paths to standard web CSS. */
+	Set<String> getWebCssPaths();
+
 	/** Relative paths to RAP specific CSS. */
 	Set<String> getRapCssPaths();
 
+	/** Relative paths to SWT specific CSS. */
+	Set<String> getSwtCssPaths();
+
 	/** Relative paths to images such as icons. */
 	Set<String> getImagesPaths();
 
@@ -34,6 +40,9 @@ public interface CmsTheme {
 	/** The default icon size (typically the smallest). */
 	Integer getDefaultIconSize();
 
+	/** Loads one of the relative path provided by the other methods. */
+	InputStream loadPath(String path) throws IOException;
+
 	/**
 	 * And icon with this file name (without the extension), with a best effort to
 	 * find the appropriate size, or <code>null</code> if not found.
@@ -45,11 +54,16 @@ public interface CmsTheme {
 	Image getIcon(String name, Integer preferredSize);
 
 	static CmsTheme getCmsTheme(Composite parent) {
-		// find parent shell
-		Shell topShell = parent.getShell();
-		while (topShell.getParent() != null)
-			topShell = (Shell) topShell.getParent();
-		return (CmsTheme) topShell.getData(CmsTheme.class.getName());
+		CmsTheme theme = (CmsTheme) parent.getData(CmsTheme.class.getName());
+		if (theme == null) {
+			// find parent shell
+			Shell topShell = parent.getShell();
+			while (topShell.getParent() != null)
+				topShell = (Shell) topShell.getParent();
+			theme = (CmsTheme) topShell.getData(CmsTheme.class.getName());
+			parent.setData(CmsTheme.class.getName(), theme);
+		}
+		return theme;
 	}
 
 	static void registerCmsTheme(Shell shell, CmsTheme theme) {