- fixed Component.setStyleSheetClass() not working

christophhart · Sep 19, 2024 · 3a60657 · 3a60657
1 parent 029c1b9
commit 3a60657
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/currentGitHash.txt b/currentGitHash.txt
@@ -1 +1 @@
-4e2a0929fb66974efaa1869b61fa9601c69372fc
+029c1b9eb8be3ea6ab1b17cbc4b7b03b112dbf00
diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h
@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "4e2a0929fb66974efaa1869b61fa9601c69372fc" 
+#define PREVIOUS_HISE_COMMIT "029c1b9eb8be3ea6ab1b17cbc4b7b03b112dbf00" 
diff --git a/hi_scripting/scripting/api/ScriptingApiContent.cpp b/hi_scripting/scripting/api/ScriptingApiContent.cpp
@@ -1751,9 +1751,12 @@ juce::LookAndFeel* ScriptingApi::Content::ScriptComponent::createLocalLookAndFee
             initProperty("textColour");
 
             removePropertyIfDefault = false;
-
-            simple_css::Selector classType(simple_css::SelectorType::Class, propertyTree["type"].toString().toLowerCase());
-            styleSheetProperties.setProperty("class", classType.toString(), nullptr);
+
+			if(!styleSheetProperties.hasProperty("class"))
+			{
+				simple_css::Selector classType(simple_css::SelectorType::Class, propertyTree["type"].toString().toLowerCase());
+				styleSheetProperties.setProperty("class", classType.toString(), nullptr);
+			}
 
 			return new ScriptingObjects::ScriptedLookAndFeel::CSSLaf(l, contentComponent, componentToRegister, this->propertyTree, this->styleSheetProperties);
 		}

diff --git a/hi_scripting/scripting/api/ScriptingGraphics.cpp b/hi_scripting/scripting/api/ScriptingGraphics.cpp
@@ -2844,8 +2844,11 @@ ScriptingObjects::ScriptedLookAndFeel::CSSLaf::CSSLaf(ScriptedLookAndFeel* paren
 							safe->getProperties().set(v, classIds);
                             root->css.clearCache(safe);
 
-                            auto ptr3 = root->css.getForComponent(safe.getComponent());
-                            ptr3->copyVarProperties(ptr2);
+                            if(auto ptr3 = root->css.getForComponent(safe.getComponent()))
+                            {
+	                            ptr3->copyVarProperties(ptr2);
+                            }
+
 						}
 						else