Layout custom objects children according to their anchors in the editor

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -272,3 +272,16 @@ const SpriteAnimationList& CustomObjectConfiguration::GetAnimations() const {
 SpriteAnimationList& CustomObjectConfiguration::GetAnimations() {
   return animations;
 }
+
+const gd::CustomObjectConfiguration::EdgeAnchor
+CustomObjectConfiguration::GetEdgeAnchorFromString(const gd::String &value) {
+  return (value == _("Window left") || value == _("Window top"))
+             ? gd::CustomObjectConfiguration::EdgeAnchor::MinEdge
+         : (value == _("Window right") || value == _("Window bottom"))
+             ? gd::CustomObjectConfiguration::EdgeAnchor::MaxEdge
+         : value == _("Proportional")
+             ? gd::CustomObjectConfiguration::EdgeAnchor::Proportional
+         : value == _("Window center")
+             ? gd::CustomObjectConfiguration::EdgeAnchor::Center
+             : gd::CustomObjectConfiguration::EdgeAnchor::NoAnchor;
+}

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -98,6 +98,17 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
    */
   SpriteAnimationList& GetAnimations();
 
+  enum EdgeAnchor {
+    NoAnchor = 0,
+    MinEdge = 1,
+    MaxEdge = 2,
+    Proportional = 3,
+    Center = 4,
+  };
+
+  static const gd::CustomObjectConfiguration::EdgeAnchor
+  GetEdgeAnchorFromString(const gd::String &value);
+
 protected:
   void DoSerializeTo(SerializerElement& element) const override;
   void DoUnserializeFrom(Project& project, const SerializerElement& element) override;

Core/GDCore/Project/EventsBasedObject.cpp

@@ -17,6 +17,7 @@ EventsBasedObject::EventsBasedObject()
     isAnimatable(false),
     isTextContainer(false),
     isInnerAreaFollowingParentSize(false),
+    isUsingLegacyInstancesRenderer(false),
     areaMinX(0),
     areaMinY(0),
     areaMinZ(0),
@@ -41,6 +42,7 @@ void EventsBasedObject::SerializeTo(SerializerElement& element) const {
   if (isInnerAreaFollowingParentSize) {
     element.SetBoolAttribute("isInnerAreaFollowingParentSize", true);
   }
+  element.SetBoolAttribute("isUsingLegacyInstancesRenderer", isUsingLegacyInstancesRenderer);
   element.SetIntAttribute("areaMinX", areaMinX);
   element.SetIntAttribute("areaMinY", areaMinY);
   element.SetIntAttribute("areaMinZ", areaMinZ);
@@ -88,6 +90,15 @@ void EventsBasedObject::UnserializeFrom(gd::Project& project,
   }
 
   initialInstances.UnserializeFrom(element.GetChild("instances"));
+  if (element.HasAttribute("isUsingLegacyInstancesRenderer")) {
+    isUsingLegacyInstancesRenderer =
+        element.GetBoolAttribute("isUsingLegacyInstancesRenderer", false);
+  }
+  else {
+    // Compatibility with GD <= 5.4.212
+    isUsingLegacyInstancesRenderer = initialInstances.GetInstancesCount() == 0;
+    // end of compatibility code
+  }
 }
 
 }  // namespace gd

Core/GDCore/Project/EventsBasedObject.h

@@ -111,7 +111,7 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
    * adapt there size. This is removing the ScalableCapability.
    */
   EventsBasedObject &
-  MarkAsInnerAreaExpandingWithParent(bool isInnerAreaExpandingWithParent_) {
+  MarkAsInnerAreaFollowingParentSize(bool isInnerAreaExpandingWithParent_) {
     isInnerAreaFollowingParentSize = isInnerAreaExpandingWithParent_;
     return *this;
   }
@@ -130,6 +130,24 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
     return isInnerAreaFollowingParentSize;
   }
 
+  /**
+   * \brief Declare that custom object are rendered using their child-objects
+   * instead of their child-instances.
+   */
+  EventsBasedObject &
+  MakAsUsingLegacyInstancesRenderer(bool isUsingLegacyInstancesRenderer_) {
+    isUsingLegacyInstancesRenderer = isUsingLegacyInstancesRenderer_;
+    return *this;
+  }
+
+  /**
+   * \brief Return true if custom object are rendered using their child-objects
+   * instead of their child-instances.
+   */
+  bool IsUsingLegacyInstancesRenderer() const {
+    return isUsingLegacyInstancesRenderer;
+  }
+
   /**
    * \brief Return true if the object needs a TextContainer capability.
    */
@@ -304,6 +322,7 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity {
   bool isAnimatable;
   bool isTextContainer;
   bool isInnerAreaFollowingParentSize;
+  bool isUsingLegacyInstancesRenderer;
   gd::InitialInstancesContainer initialInstances;
   gd::LayersContainer layers;
   gd::ObjectsContainer objectsContainer;

Extensions/AnchorBehavior/AnchorBehavior.cpp

@@ -66,7 +66,7 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
       .SetDescription(_("otherwise, objects are anchored according to the "
                         "window size when the object is created."));
 
-  properties[_("Left edge anchor")]
+  properties["leftEdgeAnchor"]
       .SetValue(GetAnchorAsString(static_cast<HorizontalAnchor>(
           behaviorContent.GetIntAttribute("leftEdgeAnchor"))))
       .SetType("Choice")
@@ -75,9 +75,10 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
       .AddExtraInfo(_("Window center"))
       .AddExtraInfo(_("Window right"))
       .AddExtraInfo(_("Proportional"))
+      .SetLabel(_("Left edge anchor"))
       .SetDescription(_("Anchor the left edge of the object on X axis."));
 
-  properties[_("Right edge anchor")]
+  properties["rightEdgeAnchor"]
       .SetValue(GetAnchorAsString(static_cast<HorizontalAnchor>(
           behaviorContent.GetIntAttribute("rightEdgeAnchor"))))
       .SetType("Choice")
@@ -86,9 +87,10 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
       .AddExtraInfo(_("Window center"))
       .AddExtraInfo(_("Window right"))
       .AddExtraInfo(_("Proportional"))
+      .SetLabel(_("Right edge anchor"))
       .SetDescription(_("Anchor the right edge of the object on X axis."));
 
-  properties[_("Top edge anchor")]
+  properties["topEdgeAnchor"]
       .SetValue(GetAnchorAsString(static_cast<VerticalAnchor>(
           behaviorContent.GetIntAttribute("topEdgeAnchor"))))
       .SetType("Choice")
@@ -97,9 +99,10 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
       .AddExtraInfo(_("Window center"))
       .AddExtraInfo(_("Window bottom"))
       .AddExtraInfo(_("Proportional"))
+      .SetLabel(_("Top edge anchor"))
       .SetDescription(_("Anchor the top edge of the object on Y axis."));
 
-  properties[_("Bottom edge anchor")]
+  properties["bottomEdgeAnchor"]
       .SetValue(GetAnchorAsString(static_cast<VerticalAnchor>(
           behaviorContent.GetIntAttribute("bottomEdgeAnchor"))))
       .SetType("Choice")
@@ -108,9 +111,10 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(
       .AddExtraInfo(_("Window center"))
       .AddExtraInfo(_("Window bottom"))
       .AddExtraInfo(_("Proportional"))
+      .SetLabel(_("Bottom edge anchor"))
       .SetDescription(_("Anchor the bottom edge of the object on Y axis."));
 
-  properties[("useLegacyBottomAndRightAnchors")]
+  properties["useLegacyBottomAndRightAnchors"]
       .SetLabel(_(
           "Stretch object when anchoring right or bottom edge (deprecated, "
           "it's recommended to leave this unchecked and anchor both sides if "
@@ -158,20 +162,20 @@ AnchorBehavior::VerticalAnchor GetVerticalAnchorFromString(
 bool AnchorBehavior::UpdateProperty(gd::SerializerElement& behaviorContent,
                                     const gd::String& name,
                                     const gd::String& value) {
-  if (name == _("relativeToOriginalWindowSize"))
+  if (name == "relativeToOriginalWindowSize")
     behaviorContent.SetAttribute("relativeToOriginalWindowSize", value == "1");
-  else if (name == _("Left edge anchor"))
+  else if (name == "leftEdgeAnchor")
     behaviorContent.SetAttribute(
         "leftEdgeAnchor",
         static_cast<int>(GetHorizontalAnchorFromString(value)));
-  else if (name == _("Right edge anchor"))
+  else if (name == "rightEdgeAnchor")
     behaviorContent.SetAttribute(
         "rightEdgeAnchor",
         static_cast<int>(GetHorizontalAnchorFromString(value)));
-  else if (name == _("Top edge anchor"))
+  else if (name == "topEdgeAnchor")
     behaviorContent.SetAttribute(
         "topEdgeAnchor", static_cast<int>(GetVerticalAnchorFromString(value)));
-  else if (name == _("Bottom edge anchor"))
+  else if (name == "bottomEdgeAnchor")
     behaviorContent.SetAttribute(
         "bottomEdgeAnchor",
         static_cast<int>(GetVerticalAnchorFromString(value)));

GDevelop.js/Bindings/Bindings.idl

@@ -874,6 +874,14 @@ interface ObjectJsImplementation {
     // void DoUnserializeFrom([Ref] Project project, [Const, Ref] SerializerElement element);
 };
 
+enum CustomObjectConfiguration_EdgeAnchor {
+    "CustomObjectConfiguration::NoAnchor",
+    "CustomObjectConfiguration::MinEdge",
+    "CustomObjectConfiguration::MaxEdge",
+    "CustomObjectConfiguration::Proportional",
+    "CustomObjectConfiguration::Center",
+};
+
 interface CustomObjectConfiguration {
     [Value] UniquePtrObjectConfiguration Clone();
 
@@ -896,6 +904,8 @@ interface CustomObjectConfiguration {
         DOMString value);
 
     [Ref] SpriteAnimationList GetAnimations();
+
+    CustomObjectConfiguration_EdgeAnchor STATIC_GetEdgeAnchorFromString([Const] DOMString value);
 };
 CustomObjectConfiguration implements ObjectConfiguration;
 
@@ -2971,8 +2981,10 @@ interface EventsBasedObject {
     boolean IsAnimatable();
     [Ref] EventsBasedObject MarkAsTextContainer(boolean isTextContainer);
     boolean IsTextContainer();
-    [Ref] EventsBasedObject MarkAsInnerAreaExpandingWithParent(boolean value);
+    [Ref] EventsBasedObject MarkAsInnerAreaFollowingParentSize(boolean value);
     boolean IsInnerAreaFollowingParentSize();
+    [Ref] EventsBasedObject MakAsUsingLegacyInstancesRenderer(boolean value);
+    boolean IsUsingLegacyInstancesRenderer();
 
     [Ref] InitialInstancesContainer GetInitialInstances();
     [Ref] LayersContainer GetLayers();

GDevelop.js/Bindings/Wrapper.cpp

@@ -461,6 +461,8 @@ typedef std::vector<UnfilledRequiredBehaviorPropertyProblem>
 typedef std::vector<const gd::ObjectFolderOrObject*> VectorObjectFolderOrObject;
 typedef QuickCustomization::Visibility
     QuickCustomization_Visibility;
+typedef CustomObjectConfiguration::EdgeAnchor
+    CustomObjectConfiguration_EdgeAnchor;
 
 typedef ExtensionAndMetadata<BehaviorMetadata> ExtensionAndBehaviorMetadata;
 typedef ExtensionAndMetadata<ObjectMetadata> ExtensionAndObjectMetadata;
@@ -808,6 +810,7 @@ typedef ExtensionAndMetadata<ExpressionMetadata> ExtensionAndExpressionMetadata;
 #define STATIC_GetDefaultMeasurementUnitAtIndex GetDefaultMeasurementUnitAtIndex
 #define STATIC_GetDefaultMeasurementUnitByName GetDefaultMeasurementUnitByName
 #define STATIC_HasDefaultMeasurementUnitNamed HasDefaultMeasurementUnitNamed
+#define STATIC_GetEdgeAnchorFromString GetEdgeAnchorFromString
 
 // We postfix some methods with "At" as Javascript does not support overloading
 #define GetLayoutAt GetLayout

GDevelop.js/scripts/generate-types.js

@@ -224,6 +224,24 @@ type QuickCustomization_Visibility = 0 | 1 | 2`
       ].join('\n'),
       'types/gdquickcustomization.js'
     );
+    fs.writeFileSync(
+      'types/customobjectconfiguration_edgeAnchor.js',
+      `// Automatically generated by GDevelop.js/scripts/generate-types.js
+type CustomObjectConfiguration_EdgeAnchor = 0 | 1 | 2 | 3 | 4`
+    );
+    shell.sed(
+      '-i',
+      'declare class gdCustomObjectConfiguration extends gdObjectConfiguration {',
+      [
+        'declare class gdCustomObjectConfiguration extends gdObjectConfiguration {',
+        '  static NoAnchor: 0;',
+        '  static MinEdge: 1;',
+        '  static MaxEdge: 2;',
+        '  static Proportional: 3;',
+        '  static Center: 4;',
+      ].join('\n'),
+      'types/gdcustomobjectconfiguration.js'
+    );
 
     // Add convenience methods that are manually added (see postjs.js):
     shell.sed(

GDevelop.js/types.d.ts

@@ -46,6 +46,14 @@ export enum ObjectsContainersList_VariableExistence {
   ExistsOnlyOnSomeObjectsOfTheGroup = 3,
 }
 
+export enum CustomObjectConfiguration_EdgeAnchor {
+  NoAnchor = 0,
+  MinEdge = 1,
+  MaxEdge = 2,
+  Proportional = 3,
+  Center = 4,
+}
+
 export enum QuickCustomization_Visibility {
   Default = 0,
   Visible = 1,
@@ -741,6 +749,7 @@ export class CustomObjectConfiguration extends ObjectConfiguration {
   getInitialInstanceProperties(instance: InitialInstance): MapStringPropertyDescriptor;
   updateInitialInstanceProperty(instance: InitialInstance, name: string, value: string): boolean;
   getAnimations(): SpriteAnimationList;
+  static getEdgeAnchorFromString(value: string): CustomObjectConfiguration_EdgeAnchor;
 }
 
 export class Layout extends EmscriptenObject {
@@ -2164,8 +2173,10 @@ export class EventsBasedObject extends AbstractEventsBasedEntity {
   isAnimatable(): boolean;
   markAsTextContainer(isTextContainer: boolean): EventsBasedObject;
   isTextContainer(): boolean;
-  markAsInnerAreaExpandingWithParent(value: boolean): EventsBasedObject;
+  markAsInnerAreaFollowingParentSize(value: boolean): EventsBasedObject;
   isInnerAreaFollowingParentSize(): boolean;
+  makAsUsingLegacyInstancesRenderer(value: boolean): EventsBasedObject;
+  isUsingLegacyInstancesRenderer(): boolean;
   getInitialInstances(): InitialInstancesContainer;
   getLayers(): LayersContainer;
   getObjects(): ObjectsContainer;

GDevelop.js/types/customobjectconfiguration_edgeanchor.js

@@ -0,0 +1,2 @@
+// Automatically generated by GDevelop.js/scripts/generate-types.js
+type CustomObjectConfiguration_EdgeAnchor = 0 | 1 | 2 | 3 | 4

GDevelop.js/types/gdcustomobjectconfiguration.js

@@ -1,5 +1,10 @@
 // Automatically generated by GDevelop.js/scripts/generate-types.js
 declare class gdCustomObjectConfiguration extends gdObjectConfiguration {
+  static NoAnchor: 0;
+  static MinEdge: 1;
+  static MaxEdge: 2;
+  static Proportional: 3;
+  static Center: 4;
   clone(): gdUniquePtrObjectConfiguration;
   isForcedToOverrideEventsBasedObjectChildrenConfiguration(): boolean;
   isMarkedAsOverridingEventsBasedObjectChildrenConfiguration(): boolean;
@@ -11,6 +16,7 @@ declare class gdCustomObjectConfiguration extends gdObjectConfiguration {
   getInitialInstanceProperties(instance: gdInitialInstance): gdMapStringPropertyDescriptor;
   updateInitialInstanceProperty(instance: gdInitialInstance, name: string, value: string): boolean;
   getAnimations(): gdSpriteAnimationList;
+  static getEdgeAnchorFromString(value: string): CustomObjectConfiguration_EdgeAnchor;
   delete(): void;
   ptr: number;
 };

GDevelop.js/types/gdeventsbasedobject.js

@@ -15,8 +15,10 @@ declare class gdEventsBasedObject extends gdAbstractEventsBasedEntity {
   isAnimatable(): boolean;
   markAsTextContainer(isTextContainer: boolean): gdEventsBasedObject;
   isTextContainer(): boolean;
-  markAsInnerAreaExpandingWithParent(value: boolean): gdEventsBasedObject;
+  markAsInnerAreaFollowingParentSize(value: boolean): gdEventsBasedObject;
   isInnerAreaFollowingParentSize(): boolean;
+  makAsUsingLegacyInstancesRenderer(value: boolean): gdEventsBasedObject;
+  isUsingLegacyInstancesRenderer(): boolean;
   getInitialInstances(): gdInitialInstancesContainer;
   getLayers(): gdLayersContainer;
   getObjects(): gdObjectsContainer;

GDevelop.js/types/libgdevelop.js

@@ -92,6 +92,7 @@ declare class libGDevelop {
   gdObject: Class<gdObject>;
   UniquePtrObject: Class<gdUniquePtrObject>;
   ObjectJsImplementation: Class<gdObjectJsImplementation>;
+  CustomObjectConfiguration_EdgeAnchor: Class<CustomObjectConfiguration_EdgeAnchor>;
   CustomObjectConfiguration: Class<gdCustomObjectConfiguration>;
   Layout: Class<gdLayout>;
   ExternalEvents: Class<gdExternalEvents>;

newIDE/app/src/EventsBasedObjectEditor/EventsBasedObjectEditorPanel.js

@@ -20,6 +20,7 @@ type Props = {|
   onEventsFunctionsAdded: () => void,
   onOpenCustomObjectEditor: () => void,
   unsavedChanges?: ?UnsavedChanges,
+  onEventsBasedObjectChildrenEdited: () => void,
 |};
 
 export default function EventsBasedObjectEditorPanel({
@@ -31,6 +32,7 @@ export default function EventsBasedObjectEditorPanel({
   onEventsFunctionsAdded,
   onOpenCustomObjectEditor,
   unsavedChanges,
+  onEventsBasedObjectChildrenEdited,
 }: Props) {
   const [currentTab, setCurrentTab] = React.useState<TabName>('configuration');
 
@@ -69,6 +71,9 @@ export default function EventsBasedObjectEditorPanel({
             eventsBasedObject={eventsBasedObject}
             unsavedChanges={unsavedChanges}
             onOpenCustomObjectEditor={onOpenCustomObjectEditor}
+            onEventsBasedObjectChildrenEdited={
+              onEventsBasedObjectChildrenEdited
+            }
           />
         )}
         {currentTab === 'properties' && (