dazscript-framework 1.0.22 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

package/src/dialog/builders/dialog-builder.ts

@@ -42,12 +42,18 @@ export class DialogBuilder extends WidgetsBuilder {
         let dialogWidget = this.context.dialog.getWidget();
         let sizeHint = dialogWidget.minimumSizeHint;
         let maxHeight = this.properties.maxHeight;
-        let height = this.properties.height ?? sizeHint.height;
-        if (maxHeight !== undefined && height > maxHeight) height = maxHeight;
-        this.context.dialog.minHeight = maxHeight !== undefined
-            ? Math.min(sizeHint.height, maxHeight)
-            : sizeHint.height;
-        this.context.dialog.height = height;
+        let hasExplicitHeight = this.properties.height !== undefined;
+        let height = this.properties.height;
+        if (height !== undefined && maxHeight !== undefined && height > maxHeight) height = maxHeight;
+
+        if (maxHeight !== undefined) {
+            this.context.dialog.minHeight = Math.min(sizeHint.height, maxHeight);
+        }
+        else if (height !== undefined) {
+            this.context.dialog.minHeight = height;
+        }
+
+        if (height !== undefined) this.context.dialog.height = height;
 
         if (this.properties.width) this.context.dialog.width = this.properties.width;
         if (this.properties.maxWidth !== undefined) this.context.dialog.maxWidth = this.properties.maxWidth;
@@ -59,7 +65,8 @@ export class DialogBuilder extends WidgetsBuilder {
         else {
             if (this.properties.width)
                 this.context.dialog.setFixedWidth(this.properties.width);
-            this.context.dialog.setFixedHeight(height);
+            if (hasExplicitHeight && height !== undefined)
+                this.context.dialog.setFixedHeight(height);
         }
     }
 

package/src/dialog/dialog-geometry-trace.test.ts

@@ -15,6 +15,16 @@ class HeaderDialog extends BasicDialog {
     }
 }
 
+class NonResizableDefaultSizeDialog extends BasicDialog {
+    protected build(): void { }
+}
+
+class ExplicitFixedHeightDialog extends BasicDialog {
+    protected build(): void {
+        this.builder.options({ height: 35 })
+    }
+}
+
 describe('dialog geometry trace', () => {
     beforeEach(() => {
         ; (globalThis as any).App = {
@@ -29,7 +39,11 @@ describe('dialog geometry trace', () => {
             width = 300
             height = 200
             minHeight = 0
+            maxHeight = 0
+            maxWidth = 0
             sizeGripEnabled = false
+            fixedHeight: number | undefined
+            fixedWidth: number | undefined
             private widget = {
                 objectName: '',
                 x: 10,
@@ -50,12 +64,31 @@ describe('dialog geometry trace', () => {
             addLayout() { }
 
             exec() {
-                this.width = 640
-                this.height = 480
-                this.widget.width = 640
-                this.widget.height = 480
+                if (this.sizeGripEnabled) {
+                    this.width = 640
+                    this.height = 480
+                    this.widget.width = 640
+                    this.widget.height = 480
+                    return true
+                }
+
+                this.widget.minimumSizeHint = { width: 196, height: 76 }
+                this.width = this.fixedWidth ?? this.widget.minimumSizeHint.width
+                this.height = this.fixedHeight ?? this.widget.minimumSizeHint.height
+                this.widget.width = this.width
+                this.widget.height = this.height
                 return true
             }
+
+            setFixedHeight(value: number) {
+                this.fixedHeight = value
+                this.height = value
+            }
+
+            setFixedWidth(value: number) {
+                this.fixedWidth = value
+                this.width = value
+            }
         }
         const Layout = class {
             direction = 0
@@ -145,4 +178,30 @@ describe('dialog geometry trace', () => {
             message.includes('objectName="Vholf3DPowerMenu-ActiveToolDlg"')
         )).toBe(true)
     })
+
+    it('does not freeze a non-resizable dialog to an early implicit size hint', () => {
+        new NonResizableDefaultSizeDialog('Store Active Camera').run()
+
+        const messages = (globalThis as any).App.debug.mock.calls.map((call: unknown[]) => String(call[0]))
+
+        expect(messages.some((message: string) =>
+            message.includes('event=dialog.geometry phase=afterExec') &&
+            message.includes('objectName="StoreActiveCameraDlg"') &&
+            message.includes('dialogHeight=76') &&
+            message.includes('sizeHintHeight=76')
+        )).toBe(true)
+    })
+
+    it('keeps explicit non-resizable dialog height fixed', () => {
+        new ExplicitFixedHeightDialog('Explicit Height').run()
+
+        const messages = (globalThis as any).App.debug.mock.calls.map((call: unknown[]) => String(call[0]))
+
+        expect(messages.some((message: string) =>
+            message.includes('event=dialog.geometry phase=afterExec') &&
+            message.includes('objectName="ExplicitHeightDlg"') &&
+            message.includes('dialogHeight=35') &&
+            message.includes('sizeHintHeight=76')
+        )).toBe(true)
+    })
 })