Allow using resources as behavior properties (#5256)

Only show in developer changelog
4ian · Nov 22, 2023 · 4ee9ccd · 4ee9ccd
1 parent 1ac248b
commit 4ee9ccd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/Core/GDCore/Project/CustomConfigurationHelper.cpp b/Core/GDCore/Project/CustomConfigurationHelper.cpp
@@ -5,6 +5,8 @@
  */
 #include "CustomConfigurationHelper.h"
 
+#include <map>
+
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Project.h"
@@ -13,8 +15,6 @@
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
-#include <map>
-
 using namespace gd;
 
 void CustomConfigurationHelper::InitializeContent(
@@ -25,7 +25,8 @@ void CustomConfigurationHelper::InitializeContent(
     auto propertyType = property->GetType();
 
     if (propertyType == "String" || propertyType == "Choice" ||
-        propertyType == "Color" || propertyType == "Behavior") {
+        propertyType == "Color" || propertyType == "Behavior" ||
+        propertyType == "resource") {
       element.SetStringValue(property->GetValue());
     } else if (propertyType == "Number") {
       element.SetDoubleValue(property->GetValue().To<double>());
@@ -51,16 +52,18 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
 
     if (configurationContent.HasChild(propertyName)) {
       if (propertyType == "String" || propertyType == "Choice" ||
-          propertyType == "Color" || propertyType == "Behavior") {
+          propertyType == "Color" || propertyType == "Behavior" ||
+          propertyType == "resource") {
         newProperty.SetValue(
             configurationContent.GetChild(propertyName).GetStringValue());
       } else if (propertyType == "Number") {
         newProperty.SetValue(gd::String::From(
             configurationContent.GetChild(propertyName).GetDoubleValue()));
       } else if (propertyType == "Boolean") {
         newProperty.SetValue(
-            configurationContent.GetChild(propertyName).GetBoolValue() ? "true"
-                                                                  : "false");
+            configurationContent.GetChild(propertyName).GetBoolValue()
+                ? "true"
+                : "false");
       }
     } else {
       // No value was serialized for this property. `newProperty`
@@ -85,7 +88,8 @@ bool CustomConfigurationHelper::UpdateProperty(
   const gd::String &propertyType = property.GetType();
 
   if (propertyType == "String" || propertyType == "Choice" ||
-      propertyType == "Color" || propertyType == "Behavior") {
+      propertyType == "Color" || propertyType == "Behavior" ||
+      propertyType == "resource") {
     element.SetStringValue(newValue);
   } else if (propertyType == "Number") {
     element.SetDoubleValue(newValue.To<double>());

diff --git a/newIDE/app/src/BehaviorsEditor/Editors/BehaviorPropertiesEditor.js b/newIDE/app/src/BehaviorsEditor/Editors/BehaviorPropertiesEditor.js
@@ -12,7 +12,13 @@ type Props = BehaviorEditorProps;
 
 export default class BehaviorPropertiesEditor extends React.Component<Props> {
   render() {
-    const { behavior, object, onBehaviorUpdated } = this.props;
+    const {
+      project,
+      behavior,
+      object,
+      onBehaviorUpdated,
+      resourceManagementProps,
+    } = this.props;
 
     const propertiesSchema = propertiesMapToSchema(
       behavior.getProperties(),
@@ -27,9 +33,11 @@ export default class BehaviorPropertiesEditor extends React.Component<Props> {
       <Column expand>
         {propertiesSchema.length ? (
           <PropertiesEditor
+            project={project}
             schema={propertiesSchema}
             instances={[behavior]}
             onInstancesModified={onBehaviorUpdated}
+            resourceManagementProps={resourceManagementProps}
           />
         ) : (
           <EmptyMessage>