dazscript-framework 0.1.14 → 0.1.15

package/package.json

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

package/src/common/log.ts

@@ -43,7 +43,6 @@ export const dump = (obj: any) => {
     App.flushLogBuffer()
 }
 
-
 const format = (message: string, level?: 'ERROR' | 'TRACE' | 'DUMP' | 'INFO') => {
     if (message == null) {
         return ''

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

@@ -0,0 +1,36 @@
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class ColorPickerBuilder extends WidgetBuilderBase<DzColorWgt> {
+    private _value?: Color
+    private _minWidth: number
+    private _parent: DzWidget | DzLayout | null = null;
+
+    constructor(private readonly context: WidgetBuilderContext) {
+        super(null)
+    }
+
+    value(color: Color): this {
+        this._value = color
+        return this
+    }
+
+    minWidth(width: number): this {
+        this._minWidth = width
+        return this
+    }
+
+    parent(parent: DzWidget | DzLayout): this {
+        this._parent = parent
+        return this
+    }
+
+    override build(): DzColorWgt {
+        let widget = createWidget(this.context).parent(this._parent ?? this.context.parent).build(DzColorWgt)
+
+        if (this._value) widget.value = this._value
+        widget.minWidth = this._minWidth
+
+        return widget;
+    }
+}

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

@@ -9,6 +9,7 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
     private _direction: Direction = 'vertical'
     private _style: { flat?: boolean }
     private _visible: Observable<boolean>
+    private _columns: number = 1
 
     constructor(private context: WidgetBuilderContext) {
     }
@@ -42,11 +43,17 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
         return this
     }
 
-    build(then?: (layout: DzVBoxLayout | DzHBoxLayout) => void): DzGroupBox {
+    columns(value: number): this {
+        this._columns = value
+        return this
+    }
+
+    build(then?: (layout: DzVBoxLayout | DzHBoxLayout, groupBox: DzGroupBox) => void): DzGroupBox {
         let groupBox = createWidget(this.context).build(DzGroupBox)
 
         groupBox.title = this._title?.value
         groupBox.flat = this._style?.flat
+        groupBox.columns = this._columns
 
         this._title?.connect((text) => {
             groupBox.title = text
@@ -55,7 +62,9 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
         new LayoutBuilder(this.context)
             .parent(groupBox)
             .direction(this._direction)
-            .build(then)
+            .build((layout) => {
+                then?.(layout, groupBox)
+            })
 
         if (this._visible) {
             if (this._visible.value === false)

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

@@ -1,4 +1,3 @@
-import { AlignmentFlags } from '@dst/common/alignmentFlags';
 import { WidgetBuilderBase, createWidget } from './widget-builder';
 import { WidgetBuilderContext } from './widgets-builder';
 

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

@@ -14,7 +14,7 @@ export class PopupMenuBuilder extends WidgetBuilderBase<DzPopupMenu> {
     }
 
     parent(parent: DzWidget): this {
-        this.widget.reparent(parent, new Point(0, 0))
+        this.widget.reparent(parent)
         return this
     }
 

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

@@ -0,0 +1,23 @@
+import { WidgetBuilderBase, createWidget } from './widget-builder'
+import { WidgetBuilderContext } from './widgets-builder'
+
+export default class SliderBuilder extends WidgetBuilderBase<DzFloatSlider> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzFloatSlider))
+    }
+
+    value(value: number): this {
+        this.widget.value = value
+        return this
+    }
+
+    min(min: number): this {
+        this.widget.min = min
+        return this
+    }
+
+    max(max: number): this {
+        this.widget.max = max
+        return this
+    }
+}

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

@@ -24,17 +24,17 @@ export abstract class WidgetBuilderBase<T extends DzWidget> implements IWidgetBu
     }
 
     clickFocus(): this {
-        this.widget.getWidget().focusPolicy = DzWidget.ClickFocus
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.ClickFocus
         return this
     }
 
     tabFocus(): this {
-        this.widget.getWidget().focusPolicy = DzWidget.TabFocus
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.TabFocus
         return this
     }
 
     noFocus(): this {
-        this.widget.getWidget().focusPolicy = DzWidget.NoFocus
+        this.widget.getWidget().focusPolicy = QtFocusPolicy.NoFocus
         return this
     }
 

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

@@ -1,6 +1,7 @@
 import { Observable } from '@dsf/lib/observable'
 import { ButtonBuilder } from './button-builder'
 import CheckBoxBuilder from './checkbox-builder'
+import ColorPickerBuilder from './color-picker-builder'
 import { ComboBoxBuilder } from './combo-box-builder'
 import { ComboEditBuilder } from './combo-edit-builder'
 import GroupBoxBuilder from './groupbox-builder'
@@ -11,6 +12,7 @@ import { ListViewBuilder } from './list-view-builder'
 import { NodeSelectionComboBoxBuilder } from './node-selection-builder'
 import { PopupMenuBuilder } from './popup-menu-builder'
 import RadioButtonBuilder from './radio-builder'
+import SliderBuilder from './slider-builder'
 import { SplitterBuilder, SplitterBuilderContext } from './splitter-builder'
 import { TabBuilder, TabBuilderContext } from './tab-builder'
 import { createWidget } from './widget-builder'
@@ -104,6 +106,14 @@ export class WidgetsBuilder {
     //     return new PathComboBoxBuilder(this.context, checkBoxes)
     // }
 
+    slider(): SliderBuilder {
+        return new SliderBuilder(this.context)
+    }
+
+    color(): ColorPickerBuilder {
+        return new ColorPickerBuilder(this.context)
+    }
+
     /**
      *
      * @returns

package/src/helpers/scene-helper.ts

@@ -42,13 +42,12 @@ export const getSelectedFigure = (): DzSkeleton | null => {
  * Given the selected nodes in the scene, return the figures they are part of
  * @returns the selected figures
  */
-export const getSelectedFigures = (callback: (figure: DzSkeleton) => void | boolean = () => true): DzSkeleton[] => {
+export const getSelectedFigures = (): DzSkeleton[] => {
     let nodes: DzSkeleton[] = []
     for (let node of scene.getSelectedNodeList()) {
         let skeleton = node.getSkeleton?.()
         if (!skeleton || contains(nodes, node)) continue
         nodes.push(skeleton)
-        if (!!callback?.(skeleton)) break
     }
     return nodes
 }

package/src/helpers/undo-helper.ts

@@ -5,3 +5,4 @@ const acceptUndoFor = (caption: string, callback: () => void) => {
 }
 
 export { acceptUndoFor as acceptUndo }
+