dazscript-framework 0.1.15 → 0.1.17

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

@@ -1,106 +1,120 @@
-import { Observable } from '@dsf/lib/observable';
-import { Direction } from '../shared';
-import LayoutBuilder from './layout-builder';
-import { IWidgetBuilder } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class TabBuilder implements IWidgetBuilder<DzTabWidget> {
-    private direction: Direction = 'vertical';
-    private titleText: string;
-    private tabIndex_: Observable<number>;
-    private currentChanged: (index: number) => void;
-
-    constructor(private layoutBuilder: LayoutBuilder, private context: TabBuilderContext) {
-    }
-
-    visible(value: boolean | Observable<boolean>): this {
-        this.context.visible = typeof value === 'boolean'
-            ? new Observable(value)
-            : value
-        return this
-    }
-
-    static create(context: TabBuilderContext): TabBuilder {
-        return new TabBuilder(new LayoutBuilder(context.widgetContext), context)
-    }
-
-    horizontal(): this {
-        this.direction = 'horizontal'
-        return this
-    }
-
-    vertical(): this {
-        this.direction = 'vertical'
-        return this
-    }
-
-    title(text: string): this {
-        this.titleText = text;
-        return this;
-    }
-
-    bind(tabNumber: Observable<number>): this {
-        this.tabIndex_ = tabNumber;
-        return this;
-    }
-
-    onChanged(then: (index: number) => void): this {
-        this.currentChanged = then
-        return this
-    }
-
-    build(then?: (layout: DzVBoxLayout | DzHBoxLayout, tabWidget: DzTabWidget) => void): DzTabWidget {
-        return this.context.add((tabWidget) => {
-            let tab = new DzWidget(this.context.widgetContext.dialog)
-            tabWidget.addTab(tab, this.titleText)
-            this.context.widgetContext.layout.addWidget(tabWidget)
-
-            this.layoutBuilder
-                .parent(tab)
-                .direction(this.direction)
-                .build((layout) => {
-                    then?.(layout, tabWidget)
-                })
-
-            if (this.context.visible) {
-                if (this.context.visible.value === false)
-                    tab.hide()
-                this.context.visible.connect((visible) => {
-                    if (visible)
-                        tab.show()
-                    else
-                        tab.hide()
-                })
-            }
-
-            tabWidget["currentChanged(int)"].scriptConnect((index: number) => {
-                if (this.tabIndex_) this.tabIndex_.value = index
-                this.currentChanged?.(index)
-            })
-
-            tabWidget.setCurrentPage(this.tabIndex_?.value ?? 0)
-        });
-    }
-}
-
-export class TabBuilderContext {
-    private counter = 1;
-    private widgets: DzTabWidget[] = [];
-    visible: Observable<boolean>
-
-    constructor(public readonly widgetContext: WidgetBuilderContext) { }
-
-    add(content: (tabWidget: DzTabWidget) => void): DzTabWidget {
-        this.counter++
-        let tabWidget = this.getWidget()
-        content(tabWidget)
-        this.counter--
-        return tabWidget
-    }
-
-    private getWidget(): DzTabWidget {
-        if (this.widgets.length === 0 || this.counter >= this.widgets.length)
-            this.widgets[this.counter] = new DzTabWidget(this.widgetContext.dialog);
-        return this.widgets[this.counter];
-    }
-}
+import { Observable } from '@dsf/lib/observable';
+import { Direction } from '../shared';
+import LayoutBuilder from './layout-builder';
+import { IWidgetBuilder } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class TabBuilder implements IWidgetBuilder<DzTabWidget> {
+    private direction: Direction = 'vertical';
+    private titleText: string;
+    private tabIndex_: Observable<number>;
+    private currentChanged: (index: number) => void;
+    private height_: number | null = null;
+    private minHeight_: number | null = null;
+
+    constructor(private layoutBuilder: LayoutBuilder, private context: TabBuilderContext) {
+    }
+
+    visible(value: boolean | Observable<boolean>): this {
+        this.context.visible = typeof value === 'boolean'
+            ? new Observable(value)
+            : value
+        return this
+    }
+
+    height(value: number): this {
+        this.height_ = value
+        return this
+    }
+
+    minHeight(value: number): this {
+        this.minHeight_ = value
+        return this
+    }
+
+    static create(context: TabBuilderContext): TabBuilder {
+        return new TabBuilder(new LayoutBuilder(context.widgetContext), context)
+    }
+
+    horizontal(): this {
+        this.direction = 'horizontal'
+        return this
+    }
+
+    vertical(): this {
+        this.direction = 'vertical'
+        return this
+    }
+
+    title(text: string): this {
+        this.titleText = text;
+        return this;
+    }
+
+    bind(tabNumber: Observable<number>): this {
+        this.tabIndex_ = tabNumber;
+        return this;
+    }
+
+    onChanged(then: (index: number) => void): this {
+        this.currentChanged = then
+        return this
+    }
+
+    build(then?: (layout: DzVBoxLayout | DzHBoxLayout, tabWidget: DzTabWidget) => void): DzTabWidget {
+        return this.context.add((tabWidget) => {
+            if (this.height_ !== null) tabWidget.height = this.height_
+            if (this.minHeight_ !== null) tabWidget.minHeight = this.minHeight_
+            let tab = new DzWidget(this.context.widgetContext.dialog)
+            tabWidget.addTab(tab, this.titleText)
+            this.context.widgetContext.layout.addWidget(tabWidget)
+
+            this.layoutBuilder
+                .parent(tab)
+                .direction(this.direction)
+                .build((layout) => {
+                    then?.(layout, tabWidget)
+                })
+
+            if (this.context.visible) {
+                if (this.context.visible.value === false)
+                    tab.hide()
+                this.context.visible.connect((visible) => {
+                    if (visible)
+                        tab.show()
+                    else
+                        tab.hide()
+                })
+            }
+
+            tabWidget["currentChanged(int)"].scriptConnect((index: number) => {
+                if (this.tabIndex_) this.tabIndex_.value = index
+                this.currentChanged?.(index)
+            })
+
+            tabWidget.setCurrentPage(this.tabIndex_?.value ?? 0)
+        });
+    }
+}
+
+export class TabBuilderContext {
+    private counter = 1;
+    private widgets: DzTabWidget[] = [];
+    visible: Observable<boolean>
+
+    constructor(public readonly widgetContext: WidgetBuilderContext) { }
+
+    add(content: (tabWidget: DzTabWidget) => void): DzTabWidget {
+        this.counter++
+        let tabWidget = this.getWidget()
+        content(tabWidget)
+        this.counter--
+        return tabWidget
+    }
+
+    private getWidget(): DzTabWidget {
+        if (this.widgets.length === 0 || this.counter >= this.widgets.length)
+            this.widgets[this.counter] = new DzTabWidget(this.widgetContext.dialog);
+        return this.widgets[this.counter];
+    }
+}

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

@@ -1,124 +1,136 @@
-import { createUID } from '@dsf/lib/guid';
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export abstract class WidgetBuilderBase<T extends DzWidget> implements IWidgetBuilder<T> {
-    constructor(protected readonly widget: T) { }
-
-    enabled<T>(when: boolean | Observable<T>): this {
-        if (typeof when === 'boolean') {
-            this.widget.enabled = when
-        }
-        else {
-            this.widget.enabled = Boolean(when.value)
-            when.connect((value) => {
-                this.widget.enabled = Boolean(value)
-            })
-        }
-        return this
-    }
-
-    focus(): this {
-        this.widget.getWidget().setFocus()
-        return this
-    }
-
-    clickFocus(): this {
-        this.widget.getWidget().focusPolicy = QtFocusPolicy.ClickFocus
-        return this
-    }
-
-    tabFocus(): this {
-        this.widget.getWidget().focusPolicy = QtFocusPolicy.TabFocus
-        return this
-    }
-
-    noFocus(): this {
-        this.widget.getWidget().focusPolicy = QtFocusPolicy.NoFocus
-        return this
-    }
-
-    toolTip(toolTip: string): this {
-        this.widget.toolTip = toolTip
-        this.widget.whatsThis = toolTip
-        return this
-    }
-
-    whatsThis(whatsThis: string): this {
-        this.widget.whatsThis = whatsThis
-        return this
-    }
-
-    visible(value: boolean | Observable<boolean>): this {
-        let observable = typeof value === 'boolean'
-            ? new Observable(value)
-            : value
-
-        if (observable.value)
-            this.widget.show()
-        else
-            this.widget.hide()
-        observable.connect((value) => {
-            if (value)
-                this.widget.show()
-            else
-                this.widget.hide()
-        })
-        return this
-    }
-
-    build(): T {
-        return this.widget
-    }
-}
-
-export interface IWidgetBuilder<T extends DzWidget> {
-    visible(value: boolean | Observable<boolean>): this
-    build(): T
-}
-
-export class WidgetBuilder {
-    private _parent: DzWidget | DzLayout;
-    private _args: any[] | null;
-
-    constructor(public readonly context: WidgetBuilderContext) { }
-
-    parent(parent: DzWidget | DzLayout): this {
-        this._parent = parent;
-        return this;
-    }
-
-    withArgs(widgetArgs: any[]): this {
-        this._args = widgetArgs;
-        return this;
-    }
-
-    build<T extends DzWidget>(type: { new(p0: any, p1?: any, p2?: any, p3?: any): T; }, then?: (widget: T) => void): T {
-        let parent = this._parent ?? this.context.parent;
-        let name = createUID();
-        let widget: T;
-
-        if (parent.inherits("DzLayout")) {
-            let args = this._args;
-            if (!args || args.length === 0) widget = new type(this.context.dialog);
-            else if (args.length === 1) widget = new type(this.context.dialog, args[0]);
-            else if (args.length === 2) widget = new type(this.context.dialog, args[0], args[1]);
-            else if (args.length === 3) widget = new type(this.context.dialog, args[0], args[1], args[2]);
-            else throw Error("DzWidget Arguments out of range");
-            (<DzLayout>parent).addWidget(widget);
-        }
-        else {
-            widget = new type(parent);
-        }
-
-        widget.name = name;
-        then?.(widget);
-
-        return widget;
-    }
-}
-
-export const createWidget = (context: WidgetBuilderContext): WidgetBuilder => {
-    return new WidgetBuilder(context)
-}
-
+import { createUID } from '@dsf/lib/guid';
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export abstract class WidgetBuilderBase<T extends DzWidget> implements IWidgetBuilder<T> {
+    constructor(protected readonly widget: T) { }
+
+    enabled<T>(when: boolean | Observable<T>): this {
+        if (typeof when === 'boolean') {
+            this.widget.enabled = when
+        }
+        else {
+            this.widget.enabled = Boolean(when.value)
+            when.connect((value) => {
+                this.widget.enabled = Boolean(value)
+            })
+        }
+        return this
+    }
+
+    focus(): this {
+        this.widget.getWidget().setFocus()
+        return this
+    }
+
+    clickFocus(): this {
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.ClickFocus
+        return this
+    }
+
+    tabFocus(): this {
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.TabFocus
+        return this
+    }
+
+    noFocus(): this {
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.NoFocus
+        return this
+    }
+
+    toolTip(toolTip: string): this {
+        this.widget.toolTip = toolTip
+        this.widget.whatsThis = toolTip
+        return this
+    }
+
+    whatsThis(whatsThis: string): this {
+        this.widget.whatsThis = whatsThis
+        return this
+    }
+
+    visible(value: boolean | Observable<boolean>): this {
+        let observable = typeof value === 'boolean'
+            ? new Observable(value)
+            : value
+
+        if (observable.value)
+            this.widget.show()
+        else
+            this.widget.hide()
+        observable.connect((value) => {
+            if (value)
+                this.widget.show()
+            else
+                this.widget.hide()
+        })
+        return this
+    }
+
+    height(value: number): this {
+        this.widget.height = value
+        return this
+    }
+
+    minHeight(value: number): this {
+        this.widget.minHeight = value
+        return this
+    }
+
+    build(): T {
+        return this.widget
+    }
+}
+
+export interface IWidgetBuilder<T extends DzWidget> {
+    visible(value: boolean | Observable<boolean>): this
+    height(value: number): this
+    minHeight(value: number): this
+    build(): T
+}
+
+export class WidgetBuilder {
+    private _parent: DzWidget | DzLayout | null = null;
+    private _args: any[] | null = null;
+
+    constructor(public readonly context: WidgetBuilderContext) { }
+
+    parent(parent: DzWidget | DzLayout): this {
+        this._parent = parent;
+        return this;
+    }
+
+    withArgs(widgetArgs: any[]): this {
+        this._args = widgetArgs;
+        return this;
+    }
+
+    build<T extends DzWidget>(type: { new(p0: any, p1?: any, p2?: any, p3?: any): T; }, then?: (widget: T) => void): T {
+        let parent = this._parent ?? this.context.parent;
+        let name = createUID();
+        let widget: T;
+
+        if (parent.inherits("DzLayout")) {
+            let args = this._args;
+            if (!args || args.length === 0) widget = new type(this.context.dialog);
+            else if (args.length === 1) widget = new type(this.context.dialog, args[0]);
+            else if (args.length === 2) widget = new type(this.context.dialog, args[0], args[1]);
+            else if (args.length === 3) widget = new type(this.context.dialog, args[0], args[1], args[2]);
+            else throw Error("DzWidget Arguments out of range");
+            (<DzLayout>parent).addWidget(widget);
+        }
+        else {
+            widget = new type(parent);
+        }
+
+        widget.name = name;
+        then?.(widget);
+
+        return widget;
+    }
+}
+
+export const createWidget = (context: WidgetBuilderContext): WidgetBuilder => {
+    return new WidgetBuilder(context)
+}
+