From 3fd7f28d7e2a73f38a18520d33da92d3f3b3a493 Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Sun, 18 Aug 2024 01:41:54 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=B1=20Adds=20wrap=20mode=20for=20phone?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/lib/components/layout/DynamicLayout.svelte | 8 +++++--- app/src/lib/components/layout/LayoutManager.ts | 14 +++++++++++++- app/src/lib/components/layout/Widget.svelte | 2 +- app/src/routes/controller/+layout.svelte | 4 ++-- app/src/routes/controller/Controls.svelte | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/src/lib/components/layout/DynamicLayout.svelte b/app/src/lib/components/layout/DynamicLayout.svelte index d68fec4..2a60f4c 100644 --- a/app/src/lib/components/layout/DynamicLayout.svelte +++ b/app/src/lib/components/layout/DynamicLayout.svelte @@ -5,10 +5,11 @@ export let container: WidgetContainerConfig; -
+
{#if container.header} -
-
{container.header}
+ {/if} @@ -16,6 +17,7 @@ class="flex w-full h-full" class:flex-row={container.layout === 'column'} class:flex-col={container.layout === 'row'} + class:flex-wrap={container.layout === 'wrap'} > {#each container.widgets as widget, index (widget.id + '-' + index)} diff --git a/app/src/lib/components/layout/LayoutManager.ts b/app/src/lib/components/layout/LayoutManager.ts index e5187de..687668f 100644 --- a/app/src/lib/components/layout/LayoutManager.ts +++ b/app/src/lib/components/layout/LayoutManager.ts @@ -13,7 +13,7 @@ export interface WidgetConfig { export interface WidgetContainerConfig { id: string | number; - layout: 'row' | 'column'; + layout: 'row' | 'column' | 'wrap'; header?: string; size?: number; widgets: Array; @@ -29,6 +29,18 @@ export const WidgetComponents = { CpuUsageChart }; +export const phoneControllerLayout: Writable = persistentStore( + 'phone_controller_layout', + { + id: 'root', + layout: 'wrap', + widgets: [ + { id: 2, component: 'Stream' }, + { id: 1, component: 'Visualization', props: { debug: true } } + ] + } as WidgetContainerConfig +); + export const controllerLayout: Writable = persistentStore( 'controller_layout', { diff --git a/app/src/lib/components/layout/Widget.svelte b/app/src/lib/components/layout/Widget.svelte index 6e4c0f7..42a289b 100644 --- a/app/src/lib/components/layout/Widget.svelte +++ b/app/src/lib/components/layout/Widget.svelte @@ -2,6 +2,6 @@ export let size = 1; -
+
diff --git a/app/src/routes/controller/+layout.svelte b/app/src/routes/controller/+layout.svelte index f0e7d8a..39f318a 100644 --- a/app/src/routes/controller/+layout.svelte +++ b/app/src/routes/controller/+layout.svelte @@ -1,13 +1,13 @@
- +
diff --git a/app/src/routes/controller/Controls.svelte b/app/src/routes/controller/Controls.svelte index 17a4483..7346323 100644 --- a/app/src/routes/controller/Controls.svelte +++ b/app/src/routes/controller/Controls.svelte @@ -113,7 +113,7 @@ handleRange(e, 'height')} />
-
+
{#each modes as modeValue}