From cd0b3f120e47dfb426965e0a346ae18bce610236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davy=20H=C3=A9lard?= Date: Tue, 1 Oct 2024 19:24:48 +0200 Subject: [PATCH] Fix flow. --- Extensions/AnchorBehavior/anchorruntimebehavior.ts | 3 +-- Extensions/TextObject/textruntimeobject.ts | 3 +-- .../Renderers/CustomObjectLayoutingModel.js | 2 ++ .../Renderers/CustomObjectLayoutingModel.spec.js | 12 ++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Extensions/AnchorBehavior/anchorruntimebehavior.ts b/Extensions/AnchorBehavior/anchorruntimebehavior.ts index b920d654a9d6..25db5f94107d 100644 --- a/Extensions/AnchorBehavior/anchorruntimebehavior.ts +++ b/Extensions/AnchorBehavior/anchorruntimebehavior.ts @@ -38,8 +38,7 @@ namespace gdjs { owner: gdjs.RuntimeObject ) { super(instanceContainer, behaviorData, owner); - this._relativeToOriginalWindowSize = - !!behaviorData.relativeToOriginalWindowSize; + this._relativeToOriginalWindowSize = !!behaviorData.relativeToOriginalWindowSize; this._leftEdgeAnchor = behaviorData.leftEdgeAnchor; this._rightEdgeAnchor = behaviorData.rightEdgeAnchor; this._topEdgeAnchor = behaviorData.topEdgeAnchor; diff --git a/Extensions/TextObject/textruntimeobject.ts b/Extensions/TextObject/textruntimeobject.ts index 3ecdfc50c788..e44561aa307d 100644 --- a/Extensions/TextObject/textruntimeobject.ts +++ b/Extensions/TextObject/textruntimeobject.ts @@ -72,8 +72,7 @@ namespace gdjs { */ export class TextRuntimeObject extends gdjs.RuntimeObject - implements gdjs.TextContainer, gdjs.OpacityHandler - { + implements gdjs.TextContainer, gdjs.OpacityHandler { _characterSize: number; _fontName: string; _bold: boolean; diff --git a/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.js b/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.js index 6c7cbefe576f..936ca7211cf7 100644 --- a/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.js +++ b/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.js @@ -290,6 +290,8 @@ export interface ChildRenderedInstance { _pixiObject: { height: number }; getDefaultWidth(): number; getDefaultHeight(): number; + getWidth(): number; + getHeight(): number; getOriginX(): number; getOriginY(): number; update(): void; diff --git a/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.spec.js b/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.spec.js index 97801c19e60f..f1cd209e5498 100644 --- a/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.spec.js +++ b/newIDE/app/src/ObjectsRendering/Renderers/CustomObjectLayoutingModel.spec.js @@ -579,6 +579,18 @@ class MockedChildRenderedInstance implements ChildRenderedInstance { this.heightAfterUpdate = defaultHeight; } + getWidth(): number { + return this._instance.hasCustomSize() + ? this._instance.getCustomWidth() + : this.getDefaultWidth(); + } + + getHeight(): number { + return this._instance.hasCustomSize() + ? this._instance.getCustomHeight() + : this.getDefaultHeight(); + } + getDefaultWidth(): number { return this.defaultWidth; }