X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2FCmsTheme.java;h=bd4daec2eec6cf53c59fad747e27a9d0681330b6;hb=ebdd232d5f7d14000c423caede5cf2b0248b234a;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..bd4daec2e 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
@@ -45,11 +45,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) {