@effindomv2/fui-as 0.1.27 → 0.1.30

package/src/controls/ButtonColors.ts

@@ -0,0 +1,73 @@
+export class ButtonColors {
+  private backgroundSet: bool = false;
+  private backgroundValue: u32 = 0;
+
+  private backgroundHoverSet: bool = false;
+  private backgroundHoverValue: u32 = 0;
+
+  private backgroundPressedSet: bool = false;
+  private backgroundPressedValue: u32 = 0;
+
+  private textPrimarySet: bool = false;
+  private textPrimaryValue: u32 = 0;
+
+  private textMutedSet: bool = false;
+  private textMutedValue: u32 = 0;
+
+  private borderSet: bool = false;
+  private borderValue: u32 = 0;
+
+  background(color: u32): this {
+    this.backgroundValue = color;
+    this.backgroundSet = true;
+    return this;
+  }
+
+  backgroundHover(color: u32): this {
+    this.backgroundHoverValue = color;
+    this.backgroundHoverSet = true;
+    return this;
+  }
+
+  backgroundPressed(color: u32): this {
+    this.backgroundPressedValue = color;
+    this.backgroundPressedSet = true;
+    return this;
+  }
+
+  textPrimary(color: u32): this {
+    this.textPrimaryValue = color;
+    this.textPrimarySet = true;
+    return this;
+  }
+
+  textMuted(color: u32): this {
+    this.textMutedValue = color;
+    this.textMutedSet = true;
+    return this;
+  }
+
+  border(color: u32): this {
+    this.borderValue = color;
+    this.borderSet = true;
+    return this;
+  }
+
+  get hasBackground(): bool { return this.backgroundSet; }
+  get backgroundColor(): u32 { return this.backgroundValue; }
+
+  get hasBackgroundHover(): bool { return this.backgroundHoverSet; }
+  get backgroundHoverColor(): u32 { return this.backgroundHoverValue; }
+
+  get hasBackgroundPressed(): bool { return this.backgroundPressedSet; }
+  get backgroundPressedColor(): u32 { return this.backgroundPressedValue; }
+
+  get hasTextPrimary(): bool { return this.textPrimarySet; }
+  get textPrimaryColor(): u32 { return this.textPrimaryValue; }
+
+  get hasTextMuted(): bool { return this.textMutedSet; }
+  get textMutedColor(): u32 { return this.textMutedValue; }
+
+  get hasBorder(): bool { return this.borderSet; }
+  get borderColor(): u32 { return this.borderValue; }
+}

package/src/controls/Checkbox.ts

@@ -165,6 +165,7 @@ export class Checkbox extends PressableLabeledControl {
         this.focusedState,
         this.isEnabled,
       ),
+      this.colorsValue,
     );
   }
 

package/src/controls/LabeledControlColors.ts

@@ -1,10 +1,37 @@
 export class LabeledControlColors {
+  private backgroundSet: bool = false;
+  private backgroundValue: u32 = 0;
+
+  private borderSet: bool = false;
+  private borderValue: u32 = 0;
+
+  private accentSet: bool = false;
+  private accentValue: u32 = 0;
+
   private textPrimarySet: bool = false;
   private textPrimaryValue: u32 = 0;
 
   private textMutedSet: bool = false;
   private textMutedValue: u32 = 0;
 
+  background(color: u32): this {
+    this.backgroundValue = color;
+    this.backgroundSet = true;
+    return this;
+  }
+
+  border(color: u32): this {
+    this.borderValue = color;
+    this.borderSet = true;
+    return this;
+  }
+
+  accent(color: u32): this {
+    this.accentValue = color;
+    this.accentSet = true;
+    return this;
+  }
+
   textPrimary(color: u32): this {
     this.textPrimaryValue = color;
     this.textPrimarySet = true;
@@ -17,6 +44,15 @@ export class LabeledControlColors {
     return this;
   }
 
+  get hasBackground(): bool { return this.backgroundSet; }
+  get backgroundColor(): u32 { return this.backgroundValue; }
+
+  get hasBorder(): bool { return this.borderSet; }
+  get borderColor(): u32 { return this.borderValue; }
+
+  get hasAccent(): bool { return this.accentSet; }
+  get accentColor(): u32 { return this.accentValue; }
+
   get hasTextPrimary(): bool { return this.textPrimarySet; }
   get textPrimaryColor(): u32 { return this.textPrimaryValue; }
 

package/src/controls/RadioButton.ts

@@ -131,6 +131,7 @@ export class RadioButton extends PressableLabeledControl {
         this.focusedState,
         this.isEnabled,
       ),
+      this.colorsValue,
     );
   }
 

package/src/controls/Switch.ts

@@ -103,6 +103,7 @@ export class Switch extends PressableLabeledControl {
         this.focusedState,
         this.isEnabled,
       ),
+      this.colorsValue,
     );
   }
 

package/src/controls/index.ts

@@ -1,4 +1,5 @@
 export { Button } from "./Button";
+export { ButtonColors } from "./ButtonColors";
 export { Checkbox } from "./Checkbox";
 export { DropdownSizing, LabeledControlSizing, SliderSizing } from "./ControlSizing";
 export { LabeledControlColors } from "./LabeledControlColors";

package/src/controls/internal/ButtonPresenter.ts

@@ -7,6 +7,7 @@ import {
 import { Theme } from "../../core/Theme";
 import { FontStyle, FontWeight } from "../../core/Typography";
 import { FlexBox, TextCore } from "../../nodes";
+import { ButtonColors } from "../ButtonColors";
 
 export class ButtonVisualState {
   constructor(
@@ -42,7 +43,7 @@ export abstract class ButtonPresenter {
     return changetype<FlexBox>(this.hostValue);
   }
 
-  abstract apply(theme: Theme, state: ButtonVisualState): void;
+  abstract apply(theme: Theme, state: ButtonVisualState, colors?: ButtonColors | null): void;
 }
 
 export abstract class ButtonTemplate {
@@ -60,7 +61,7 @@ class DefaultButtonPresenter extends ButtonPresenter {
     super(contentRoot, labelNode);
   }
 
-  apply(theme: Theme, state: ButtonVisualState): void {
+  apply(theme: Theme, state: ButtonVisualState, _colors: ButtonColors | null = null): void {
     const background = state.pressed
       ? theme.colors.accentPressed
       : (state.hovered ? theme.colors.accentHovered : theme.colors.accent);

package/src/controls/internal/CheckboxIndicatorPresenter.ts

@@ -2,6 +2,7 @@ import { BorderStyle, SemanticCheckedState, Unit } from "../../core/ffi";
 import { Theme } from "../../core/Theme";
 import { FlexBox, Svg } from "../../nodes";
 import { LabeledControlSizing } from "../ControlSizing";
+import { LabeledControlColors } from "../LabeledControlColors";
 import {
   PressableIndicatorMetrics,
   PressableIndicatorPresenter,
@@ -51,7 +52,7 @@ export abstract class CheckboxIndicatorPresenter extends PressableIndicatorPrese
     super(root, metrics);
   }
 
-  abstract apply(theme: Theme, state: CheckboxIndicatorVisualState): void;
+  abstract apply(theme: Theme, state: CheckboxIndicatorVisualState, colors?: LabeledControlColors | null): void;
 }
 
 export abstract class CheckboxIndicatorTemplate {
@@ -83,20 +84,21 @@ class DefaultCheckboxIndicatorPresenter extends CheckboxIndicatorPresenter {
     root.child(markHost);
   }
 
-  apply(theme: Theme, state: CheckboxIndicatorVisualState): void {
-    let background = theme.colors.surface;
-    let borderColor = theme.colors.border;
+  apply(theme: Theme, state: CheckboxIndicatorVisualState, colors: LabeledControlColors | null = null): void {
+    let background = colors !== null && colors.hasBackground ? colors.backgroundColor : theme.colors.surface;
+    let borderColor = colors !== null && colors.hasBorder ? colors.borderColor : theme.colors.border;
     const geometry = this.geometry;
     let markVisible = false;
     let markColor = theme.colors.textPrimary;
+    const accent = colors !== null && colors.hasAccent
+      ? colors.accentColor
+      : (state.pressed ? theme.colors.accentPressed : (state.hovered ? theme.colors.accentHovered : theme.colors.accent));
     if (state.checkedState == SemanticCheckedState.True || state.checkedState == SemanticCheckedState.Mixed) {
-      background = state.pressed
-        ? theme.colors.accentPressed
-        : (state.hovered ? theme.colors.accentHovered : theme.colors.accent);
+      background = accent;
       borderColor = background;
       markVisible = state.checkedState == SemanticCheckedState.True;
       markColor = theme.colors.textOnAccent;
-    } else if (state.hovered) {
+    } else if (state.hovered && (colors === null || !colors.hasBackground)) {
       background = theme.colors.background;
     }
     this.root.cornerRadius(geometry.cornerRadius);

package/src/controls/internal/PressableLabeledControl.ts

@@ -32,7 +32,7 @@ export class PressableLabeledControl extends FlexBox {
   private readonly disposables: Array<Disposable> = new Array<Disposable>();
   private disposed: bool = false;
   private labelFontSizeOverride: f32 = 0.0;
-  private colorsValue: LabeledControlColors | null = null;
+  protected colorsValue: LabeledControlColors | null = null;
   protected hoveredState: bool = false;
   protected pressedState: bool = false;
   protected focusedState: bool = false;
@@ -182,6 +182,7 @@ export class PressableLabeledControl extends FlexBox {
   colors(colors: LabeledControlColors | null): this {
     this.colorsValue = colors;
     this.syncBaseTheme(activeTheme.value);
+    this.syncVisualState();
     return this;
   }
 

package/src/controls/internal/RadioIndicatorPresenter.ts

@@ -2,6 +2,7 @@ import { BorderStyle, Unit } from "../../core/ffi";
 import { Theme } from "../../core/Theme";
 import { FlexBox } from "../../nodes";
 import { LabeledControlSizing } from "../ControlSizing";
+import { LabeledControlColors } from "../LabeledControlColors";
 import {
   PressableIndicatorMetrics,
   PressableIndicatorPresenter,
@@ -25,7 +26,7 @@ export abstract class RadioIndicatorPresenter extends PressableIndicatorPresente
     super(root, metrics);
   }
 
-  abstract apply(theme: Theme, state: RadioIndicatorVisualState): void;
+  abstract apply(theme: Theme, state: RadioIndicatorVisualState, colors?: LabeledControlColors | null): void;
 }
 
 export abstract class RadioIndicatorTemplate {
@@ -88,14 +89,17 @@ class DefaultRadioIndicatorPresenter extends RadioIndicatorPresenter {
     root.child(dotNode);
   }
 
-  apply(theme: Theme, state: RadioIndicatorVisualState): void {
+  apply(theme: Theme, state: RadioIndicatorVisualState, colors: LabeledControlColors | null = null): void {
     const geometry = this.geometry;
+    const accent = colors !== null && colors.hasAccent
+      ? colors.accentColor
+      : (state.pressed ? theme.colors.accentPressed : (state.hovered ? theme.colors.accentHovered : theme.colors.accent));
     const outerColor = state.checked
-      ? (state.pressed ? theme.colors.accentPressed : (state.hovered ? theme.colors.accentHovered : theme.colors.accent))
-      : theme.colors.border;
+      ? accent
+      : (colors !== null && colors.hasBorder ? colors.borderColor : theme.colors.border);
     this.root.cornerRadius(geometry.indicatorSize * 0.5);
     this.root.border(geometry.borderWidth, outerColor, BorderStyle.Solid);
-    this.root.bgColor(theme.colors.surface);
+    this.root.bgColor(colors !== null && colors.hasBackground ? colors.backgroundColor : theme.colors.surface);
     this.dotNode
       .cornerRadius(geometry.dotSize * 0.5)
       .position(dotInset(geometry), dotInset(geometry))

package/src/controls/internal/SwitchIndicatorPresenter.ts

@@ -1,6 +1,7 @@
 import { BorderStyle, Unit } from "../../core/ffi";
 import { Theme } from "../../core/Theme";
 import { FlexBox } from "../../nodes";
+import { LabeledControlColors } from "../LabeledControlColors";
 import {
   PressableIndicatorMetrics,
   PressableIndicatorPresenter,
@@ -24,7 +25,7 @@ export abstract class SwitchIndicatorPresenter extends PressableIndicatorPresent
     super(root, metrics);
   }
 
-  abstract apply(theme: Theme, state: SwitchIndicatorVisualState): void;
+  abstract apply(theme: Theme, state: SwitchIndicatorVisualState, colors?: LabeledControlColors | null): void;
 }
 
 export abstract class SwitchIndicatorTemplate {
@@ -49,17 +50,25 @@ class DefaultSwitchIndicatorPresenter extends SwitchIndicatorPresenter {
     root.alignItems(1).child(thumbNode);
   }
 
-  apply(theme: Theme, state: SwitchIndicatorVisualState): void {
+  apply(theme: Theme, state: SwitchIndicatorVisualState, colors: LabeledControlColors | null = null): void {
+    const accent = colors !== null && colors.hasAccent
+      ? colors.accentColor
+      : (state.pressed ? theme.colors.accentPressed : (state.hovered ? theme.colors.accentHovered : theme.colors.accent));
     const trackColor = state.checked
-      ? (state.pressed ? theme.colors.accentPressed : (state.hovered ? theme.colors.accentHovered : theme.colors.accent))
-      : (state.hovered ? theme.colors.background : theme.colors.surface);
+      ? accent
+      : (colors !== null && colors.hasBackground
+        ? colors.backgroundColor
+        : (state.hovered ? theme.colors.background : theme.colors.surface));
+    const borderColor = colors !== null && colors.hasBorder
+      ? colors.borderColor
+      : (state.checked ? trackColor : theme.colors.border);
     this.root.cornerRadius(13.0);
-    this.root.border(1.0, state.checked ? trackColor : theme.colors.border, BorderStyle.Solid);
+    this.root.border(1.0, borderColor, BorderStyle.Solid);
     this.root.bgColor(trackColor);
     this.thumbNode.position(state.checked ? 21.0 : 3.0, 2.0);
     this.thumbNode.cornerRadius(10.0);
-    this.thumbNode.bgColor(theme.colors.surface);
-    this.thumbNode.border(1.0, state.checked ? trackColor : theme.colors.border, BorderStyle.Solid);
+    this.thumbNode.bgColor(colors !== null && colors.hasBackground ? colors.backgroundColor : theme.colors.surface);
+    this.thumbNode.border(1.0, borderColor, BorderStyle.Solid);
   }
 }
 

package/src/core/File.ts

@@ -285,10 +285,12 @@ export class FileWorkerProcessProgress {
 export class FileWorkerProcessResult {
   readonly processedBytes: u64;
   readonly outputFileName: string | null;
+  readonly workerResult: string | null;
 
-  constructor(processedBytes: u64, outputFileName: string | null) {
+  constructor(processedBytes: u64, outputFileName: string | null, workerResult: string | null = null) {
     this.processedBytes = processedBytes;
     this.outputFileName = outputFileName;
+    this.workerResult = workerResult;
   }
 }
 
@@ -961,12 +963,13 @@ export function handleFileWorkerProcessComplete(
   requestId: u32,
   processedBytes: u64,
   outputFileName: string | null,
+  workerResult: string | null = null,
 ): void {
   const request = pendingWorkerProcessRequests.has(requestId) ? unchecked(pendingWorkerProcessRequests.get(requestId)) : null;
   if (request === null) {
     return;
   }
-  request.dispatchComplete(new FileWorkerProcessResult(processedBytes, outputFileName));
+  request.dispatchComplete(new FileWorkerProcessResult(processedBytes, outputFileName, workerResult));
 }
 
 export function handleFileWorkerProcessError(requestId: u32, status: u32, message: string | null = null): void {

package/src/core/event_exports.ts

@@ -371,11 +371,25 @@ export function __fui_on_file_worker_process_complete(
   payloadPtr: usize,
   payloadLen: u32,
 ): void {
-  const outputFileName = readHostMessage(payloadPtr, payloadLen);
+  const raw = readHostMessage(payloadPtr, payloadLen);
+  let outputFileName: string | null = null;
+  let workerResult: string | null = null;
+  if (raw !== null) {
+    const nullPos = raw.indexOf("\0");
+    if (nullPos >= 0) {
+      const before = raw.substring(0, nullPos);
+      const after = raw.substring(nullPos + 1);
+      outputFileName = before.length > 0 ? before : null;
+      workerResult = after.length > 0 ? after : null;
+    } else {
+      outputFileName = raw.length > 0 ? raw : null;
+    }
+  }
   handleFileWorkerProcessComplete(
     requestId,
     processedBytes,
     outputFileName,
+    workerResult,
   );
 }
 

package/src/worker/ffi.ts

@@ -21,3 +21,9 @@ export declare function fui_worker_request_yield(): void;
 
 @external("fui_worker_host", "fui_worker_request_yield_delay")
 export declare function fui_worker_request_yield_delay(delayMs: i32): void;
+
+@external("fui_worker_host", "fui_file_read_chunk")
+export declare function fui_file_read_chunk(offsetLow: i32, offsetHigh: i32, length: i32): i32;
+
+@external("fui_worker_host", "fui_file_worker_write_chunk")
+export declare function fui_file_worker_write_chunk(ptr: usize, len: i32): void;