From 9ff61fe394662657f6e56f4a572a0fdab39c7a44 Mon Sep 17 00:00:00 2001 From: agachuma <52526593+agachuma@users.noreply.github.com> Date: Fri, 17 Apr 2026 11:42:50 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96=20Merge=20PR=20#74818=20Featur?= =?UTF-8?q?e/mapping=20editor=20by=20@agachuma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan HoĢˆrnle Co-authored-by: Paul Kellett --- types/gorilla-engine/components/MappingEditor.d.ts | 3 ++- types/gorilla-engine/components/SliceEditor.d.ts | 7 +++++++ types/gorilla-engine/gorilla-engine-tests.ts | 5 +++-- types/gorilla-engine/index.d.ts | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/types/gorilla-engine/components/MappingEditor.d.ts b/types/gorilla-engine/components/MappingEditor.d.ts index 58096e8bf0ef54..624bb2777028f9 100644 --- a/types/gorilla-engine/components/MappingEditor.d.ts +++ b/types/gorilla-engine/components/MappingEditor.d.ts @@ -1,4 +1,5 @@ declare namespace GorillaEngine.UI { + interface Zone { path: string; name: string; @@ -16,7 +17,7 @@ declare namespace GorillaEngine.UI { refreshView(index?: number): void; selectAllZones(): void; deselectAllZones(): void; - selectZones(zones: Partial): void; + selectZones(zones: Partial):void; addZones(zones: Partial): void; removeZones(zones: Partial): void; } diff --git a/types/gorilla-engine/components/SliceEditor.d.ts b/types/gorilla-engine/components/SliceEditor.d.ts index 311f2e7edc9424..dff87900f2bd64 100755 --- a/types/gorilla-engine/components/SliceEditor.d.ts +++ b/types/gorilla-engine/components/SliceEditor.d.ts @@ -69,6 +69,9 @@ declare namespace GorillaEngine.UI { overlayColorRight?: string; enforceValueOnConstraintViolation?: boolean; valueOffsetOnConstraintViolation?: number; + handleDragMode?: "full" | "handle"; + handleHeight?: number; + handlePosition?: "top" | "bottom"; styles?: { normal: SliceStyle; hover: SliceStyle; @@ -101,6 +104,7 @@ declare namespace GorillaEngine.UI { enabled: boolean; backgroundColor: string; backgroundImage: string; + measureScale: number; measures: GridMeasure[]; addMeasure(measure: GridMeasure): void; }>; @@ -108,6 +112,9 @@ declare namespace GorillaEngine.UI { normal: Partial; hover: Partial; selected: Partial; + handleDragMode: "full" | "handle"; + handleHeight: number; + handlePosition: "top" | "bottom"; }>; selectionAreaStyle: Partial<{ backgroundColor: string; diff --git a/types/gorilla-engine/gorilla-engine-tests.ts b/types/gorilla-engine/gorilla-engine-tests.ts index b3af70be7348b3..ee5b22319708dd 100644 --- a/types/gorilla-engine/gorilla-engine-tests.ts +++ b/types/gorilla-engine/gorilla-engine-tests.ts @@ -1,3 +1,4 @@ + const mylabel = new GorillaEngine.UI.Label({ text: "rr" }); const combo = new GorillaEngine.UI.ComboBox({ id: "myCombo", x: 0 }); @@ -8,10 +9,10 @@ const pad = new GorillaEngine.UI.XYPad({ id: "myXYPad" }); const scrollView = new GorillaEngine.UI.ScrollView({ id: "myScrollView" }); -const knob = new GorillaEngine.UI.Knob({ id: "myknob" }); +const knob = new GorillaEngine.UI.Knob({ id: "myknob", x: 2, y: 0}); const label = new GorillaEngine.UI.Label({ margin: 5 }); const slider = new GorillaEngine.UI.Slider({ id: "slider", x: 0, y: 2 }); -const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: "myNewMappingEditor", x: 3, y: 2 }); +const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: 'myNewMappingEditor', x: 3, y:2}) diff --git a/types/gorilla-engine/index.d.ts b/types/gorilla-engine/index.d.ts index 952821c911145e..a75e035ae341a7 100755 --- a/types/gorilla-engine/index.d.ts +++ b/types/gorilla-engine/index.d.ts @@ -608,4 +608,4 @@ declare namespace GorillaEngine { function setSettingsButtonPosition(x: number, y: number): void; } -} +} \ No newline at end of file From d0cc0c5c0fc2708b7b0d431d6db3f18413d9bf2f Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Fri, 17 Apr 2026 09:43:35 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=20dprint=20fmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/gorilla-engine/components/MappingEditor.d.ts | 3 +-- types/gorilla-engine/gorilla-engine-tests.ts | 5 ++--- types/gorilla-engine/index.d.ts | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/types/gorilla-engine/components/MappingEditor.d.ts b/types/gorilla-engine/components/MappingEditor.d.ts index 624bb2777028f9..58096e8bf0ef54 100644 --- a/types/gorilla-engine/components/MappingEditor.d.ts +++ b/types/gorilla-engine/components/MappingEditor.d.ts @@ -1,5 +1,4 @@ declare namespace GorillaEngine.UI { - interface Zone { path: string; name: string; @@ -17,7 +16,7 @@ declare namespace GorillaEngine.UI { refreshView(index?: number): void; selectAllZones(): void; deselectAllZones(): void; - selectZones(zones: Partial):void; + selectZones(zones: Partial): void; addZones(zones: Partial): void; removeZones(zones: Partial): void; } diff --git a/types/gorilla-engine/gorilla-engine-tests.ts b/types/gorilla-engine/gorilla-engine-tests.ts index ee5b22319708dd..afa7cfae0225b8 100644 --- a/types/gorilla-engine/gorilla-engine-tests.ts +++ b/types/gorilla-engine/gorilla-engine-tests.ts @@ -1,4 +1,3 @@ - const mylabel = new GorillaEngine.UI.Label({ text: "rr" }); const combo = new GorillaEngine.UI.ComboBox({ id: "myCombo", x: 0 }); @@ -9,10 +8,10 @@ const pad = new GorillaEngine.UI.XYPad({ id: "myXYPad" }); const scrollView = new GorillaEngine.UI.ScrollView({ id: "myScrollView" }); -const knob = new GorillaEngine.UI.Knob({ id: "myknob", x: 2, y: 0}); +const knob = new GorillaEngine.UI.Knob({ id: "myknob", x: 2, y: 0 }); const label = new GorillaEngine.UI.Label({ margin: 5 }); const slider = new GorillaEngine.UI.Slider({ id: "slider", x: 0, y: 2 }); -const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: 'myNewMappingEditor', x: 3, y:2}) +const mappingEditor = new GorillaEngine.UI.MappingEditor({ id: "myNewMappingEditor", x: 3, y: 2 }); diff --git a/types/gorilla-engine/index.d.ts b/types/gorilla-engine/index.d.ts index a75e035ae341a7..952821c911145e 100755 --- a/types/gorilla-engine/index.d.ts +++ b/types/gorilla-engine/index.d.ts @@ -608,4 +608,4 @@ declare namespace GorillaEngine { function setSettingsButtonPosition(x: number, y: number): void; } -} \ No newline at end of file +}