diff --git a/docs/app/island.md b/docs/app/island.md index e5eac1d..fff4ef7 100644 --- a/docs/app/island.md +++ b/docs/app/island.md @@ -50,7 +50,8 @@ description: 经典提醒、自定义常驻方案、课程与课件传输。 ## 外观、位置与输入 经典模式可调宽高、字号、主题色、黑色/半透明/渐变、停靠与边距;自定义内容根据实际测量适配工作区。 -自定义方案可配置缩放、圆角、颜色和行间距,默认值与范围在 shared/island-layout.ts。外观页的圆角滑块同步修改当前自定义方案的常态圆角,与编辑器设置一致。 +自定义方案可配置缩放、四档字号、字重、圆角、背景/前景色和行间距,默认值与范围在 shared/island-layout.ts。四档字号输入范围是 1–40px,可按组件或单行覆盖;关闭行级覆盖后只回落该行,不影响其他行。 +强调色支持自定义、壁纸调色板、跟随系统和屏幕调色板四种来源;自定义背景与前景可分别关闭,关闭后回落当前亮/暗主题。前景色会派生 100% / 85.5% / 77.3% / 52.9% / 36.5% 五级文字 alpha。外观页的圆角滑块同步修改当前自定义方案的常态圆角,与编辑器设置一致。 左右边距只在左/右停靠时生效,居中锚点仍在屏幕中线。 触摸屏自动进入触摸模式,保留触摸命中和失焦宽限;鼠标模式按光标控制输入穿透。 自定义常驻内容支持鼠标避让淡化及反转,交互入口、展开/编辑和触摸操作按实现暂停避让。 diff --git a/docs/dev/winisland-design-tokens.md b/docs/dev/winisland-design-tokens.md index 18150b0..d103414 100644 --- a/docs/dev/winisland-design-tokens.md +++ b/docs/dev/winisland-design-tokens.md @@ -10,15 +10,17 @@ description: 本地经典/自定义岛的几何、外观与动画入口。 ## 经典几何与外观 -| 来源 | 内容 | -| ---------------------------------------------------- | ----------------------------------------------------- | -| shared/src/constants.ts 的 DEFAULT_ISLAND_APPEARANCE | 默认宽 268、高 44、圆角 20、字号 13、边距 8,顶部居中 | -| ISLAND_APPEARANCE_RANGES | 滑块与主进程归一化共用的范围 | -| ISLAND_SIZE_DELTA | 展开、紧急与叫人相对尺寸 | -| ISLAND_SHADOW_PAD | 窗口边界的透明留白 | -| ISLAND_LIST_METRICS / islandListLayout | 主进程和渲染层共用列表度量,控制行数与工作区高度 | -| desktop-client/src/island/squircle.ts | 超椭圆路径 | -| desktop-client/src/island/classic-island.css | 经典底色、文字、图形与状态样式 | +| 来源 | 内容 | +| ---------------------------------------------------- | --------------------------------------------------------------------- | +| shared/src/constants.ts 的 DEFAULT_ISLAND_APPEARANCE | 默认宽 268、高 44、圆角 20、字号 13、边距 8,顶部居中 | +| shared/src/constants.ts 的 CLASSISLAND_TOKENS | 岛层颜色、字体、字号、圆角、间距、阴影、层级与 DPI 的 TypeScript 来源 | +| ISLAND_APPEARANCE_RANGES | 滑块与主进程归一化共用的范围 | +| ISLAND_SIZE_DELTA | 展开、紧急与叫人相对尺寸 | +| ISLAND_SHADOW_PAD | 窗口边界的透明留白 | +| ISLAND_LIST_METRICS / islandListLayout | 主进程和渲染层共用列表度量,控制行数与工作区高度 | +| desktop-client/src/island/squircle.ts | 超椭圆路径 | +| desktop-client/src/island/classic-island.css | 经典底色、文字、图形与状态样式 | +| ui/src/tokens.css | `--ci-*` 亮/暗两套 CSS 变量,以及五级文字工具类 | classic 的 black/glass/tinted 是本地 CSS 外观;glass 使用半透明色,不采样桌面模糊。 不要对透明岛调用 setBackgroundMaterial:系统材质作用于整窗矩形,可能破坏逐像素透明。 @@ -41,6 +43,47 @@ CLASSISLAND_ISLAND_METRICS 位于 shared/src/island-layout.ts: 方案有常态 rows 和无通知展开 expandedRows,运行时由 CustomIslandRuntime.vue 测量自然内容, 再按屏幕工作区与方案缩放适配。字体与外观覆盖按组件契约生效,不能拿经典固定宽高解释自定义内容尺寸。 +自定义岛默认使用 CSS `border-radius`;经典岛继续保留连续圆角。圆角同时作用于自绘背景与内容裁切, +默认 8px、范围 0–20px、步进 0.5px。背景色只通过 `--resident-background` 派生,背景 alpha 与整行 +`opacity` 分开计算,避免整行不透明度连带淡化投影和覆盖层。 + +### ClassIsland token 层 + +`CLASSISLAND_TOKENS` 与 `--ci-*` 一一对应,应用外壳继续使用 `--ch-*` / `--ch-ui-*`。 +ClassIsland 源值中的颜色采用 Avalonia `AARRGGBB`,写入 CSS 时统一转换为 +`RRGGBBAA`,alpha 数值不变。 + +| 类别 | 关键值 | +| -------- | ------------------------------------------------------------------------ | +| 强调色 | PrimaryColor / DeepSkyBlue、SecondaryColor / Aquamarine、DodgerBlue 兜底 | +| 五级前景 | 100% / 85.5% / 77.3% / 52.9% / 36.5%,开启自定义前景时写进颜色 alpha | +| 四档字号 | 14 / 16 / 18 / 20px,设置范围 1–40px,步进 0.5px | +| 字重 | 100–900 逐值映射,默认 500;其他值回落 400 | +| 圆角 | 岛 8、弹窗 6、卡片与控件 4、抽屉 8 8 0 0、胶囊 999px | +| 间距 | 行高 40、左右 12、组件间距 12、行距 5、进度条 3px | +| 层级 | 遮罩/拖拽 1、抽屉 10、时间轴装饰 9999、哨兵 2147483647 | +| DPI | 96 DPI 基准、缩放 0.75–2.5、Fluent 竖直安全区 20px | + +四档字号可写在组件自身、单个行或方案根元素。行级与组件级都通过 CSS 变量覆盖;关闭覆盖时删除 +对应内联变量并回落到方案或 `:root`。自定义前景关闭时同样删除行内五级变量,由 `html.dark` 切换 +主题默认值。 + +强调色来源严格区分自定义、壁纸调色板、跟随系统与屏幕调色板;主进程输出 `resolvedAccent`,设置页 +仍保留用户选择的 `accent`,避免切换来源时覆盖原自定义色。主题切换通过岛桥接的 `island:theme` +事件实时同步 `html.dark`,不依赖主窗口的 DOM。 + +### 主界面对照 + +| ClassIsland 概念 | ClassHelper 实体 | +| ----------------------- | ------------------------------------------------------------------ | +| MainWindow | 独立 `island.html` + 主进程透明 `BrowserWindow` | +| MainWindowLine | `CustomIslandRuntime.vue` 的 `.layout-row` 与行级 CSS 变量 | +| ComponentPresenter | `ComponentNode.vue` 根节点的宽高、透明度、隐藏与裁剪 | +| 日期/时钟/天气/课程组件 | `ComponentNode.vue`、`WeatherBrief.vue` 等共享组件 | +| Fluent/Classic 主题 | `custom-runtime.css` / `custom-island.css` / `classic-island.css` | +| 编辑模式视图 | 主窗口 `IslandEditorView.vue`、`IslandEditorNode.vue` 与右侧检查器 | +| 提醒宿主 | `ClassicNotifications.vue`,嵌入自定义岛或经典岛 | + ## 动画与命中 经典与自定义岛的形变都使用 src/island/spring.ts 的 SpringValue;默认 stiffness=0.10、damping=0.68, @@ -56,4 +99,5 @@ CLASSISLAND_ISLAND_METRICS 位于 shared/src/island-layout.ts: 外观范围改 shared,经典样式改 classic-island.css,自定义样式改 custom-runtime.css 和 custom-island.css, 原生窗口与命中改 main/island.ts。组件结构/设置改 shared/island-layout.ts 并同步编辑器和运行时。 +改 token 后运行 `pnpm check:design-tokens`,它会校验亮/暗键集合、必备 token、kebab-case 与岛内裸颜色。 展示行为见[灵动岛](../app/island.md),测试见[验收与测试](testing.md)。 diff --git a/docs/screenshots/desktop-responsive/main-1000-dark.png b/docs/screenshots/desktop-responsive/main-1000-dark.png index 4966ea2..9e60e31 100644 Binary files a/docs/screenshots/desktop-responsive/main-1000-dark.png and b/docs/screenshots/desktop-responsive/main-1000-dark.png differ diff --git a/docs/screenshots/desktop-responsive/main-1000-light.png b/docs/screenshots/desktop-responsive/main-1000-light.png index a1db36a..c6da01b 100644 Binary files a/docs/screenshots/desktop-responsive/main-1000-light.png and b/docs/screenshots/desktop-responsive/main-1000-light.png differ diff --git a/docs/screenshots/desktop-responsive/main-1242-dark.png b/docs/screenshots/desktop-responsive/main-1242-dark.png index 3a93e2a..efebc5c 100644 Binary files a/docs/screenshots/desktop-responsive/main-1242-dark.png and b/docs/screenshots/desktop-responsive/main-1242-dark.png differ diff --git a/docs/screenshots/desktop-responsive/main-1242-light.png b/docs/screenshots/desktop-responsive/main-1242-light.png index b138e77..6e936d4 100644 Binary files a/docs/screenshots/desktop-responsive/main-1242-light.png and b/docs/screenshots/desktop-responsive/main-1242-light.png differ diff --git a/docs/screenshots/desktop-responsive/main-1920-dark.png b/docs/screenshots/desktop-responsive/main-1920-dark.png index 53352b9..69cff93 100644 Binary files a/docs/screenshots/desktop-responsive/main-1920-dark.png and b/docs/screenshots/desktop-responsive/main-1920-dark.png differ diff --git a/docs/screenshots/desktop-responsive/main-1920-light.png b/docs/screenshots/desktop-responsive/main-1920-light.png index 5e3934a..059fa4b 100644 Binary files a/docs/screenshots/desktop-responsive/main-1920-light.png and b/docs/screenshots/desktop-responsive/main-1920-light.png differ diff --git a/package.json b/package.json index f1a3b98..17fb55c 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,9 @@ "build": "pnpm build:shared && pnpm --filter @classhelper/server build && pnpm --filter @classhelper/web-admin build && pnpm --filter @classhelper/desktop-client build", "build:desktop": "pnpm build:shared && pnpm --filter @classhelper/desktop-client build", "check:icons": "node scripts/check-icons.mjs", + "check:design-tokens": "node scripts/check-design-tokens.mjs", "typecheck": "pnpm build:shared && pnpm -r --workspace-concurrency=1 --no-bail typecheck", - "lint": "node scripts/check-authz.mjs && eslint .", + "lint": "node scripts/check-authz.mjs && node scripts/check-design-tokens.mjs && eslint .", "lint:fix": "eslint . --fix", "format": "prettier --write \"**/*.{ts,js,mjs,cjs,vue,json,md,yaml,yml,css,scss,html}\"", "format:check": "prettier --check \"**/*.{ts,js,mjs,cjs,vue,json,md,yaml,yml,css,scss,html}\"", diff --git a/packages/desktop-client/src/island/ComponentNode.vue b/packages/desktop-client/src/island/ComponentNode.vue index a1444de..07c7f01 100644 --- a/packages/desktop-client/src/island/ComponentNode.vue +++ b/packages/desktop-client/src/island/ComponentNode.vue @@ -180,11 +180,18 @@ const style = computed(() => { const n = props.node, a = n.appearance, override = a.resourceOverridingEnabled; - const color = - a.background + - Math.round((a.customBackgroundOpacityEnabled ? a.backgroundOpacity : 1) * 255) - .toString(16) - .padStart(2, '0'); + const alpha = a.customBackgroundOpacityEnabled ? a.backgroundOpacity : 1; + const color = `color-mix(in srgb, ${a.background} ${alpha * 100}%, transparent)`; + const customText: Record = + override && a.customForegroundEnabled + ? { + '--ci-text-1': a.foreground, + '--ci-text-2': `color-mix(in srgb, ${a.foreground} 85.5%, transparent)`, + '--ci-text-3': `color-mix(in srgb, ${a.foreground} 77.3%, transparent)`, + '--ci-text-4': `color-mix(in srgb, ${a.foreground} 52.9%, transparent)`, + '--ci-text-5': `color-mix(in srgb, ${a.foreground} 36.5%, transparent)`, + } + : {}; return { opacity: a.opacity, width: n.advanced.width ? `${n.advanced.width}px` : undefined, @@ -195,17 +202,19 @@ const style = computed(() => { n.advanced.align ], textAlign: n.advanced.align === 'start' ? 'start' : n.advanced.align === 'end' ? 'end' : 'center', - color: override && a.customForegroundEnabled ? a.foreground : undefined, + color: 'var(--ci-text-1)', background: override && a.customBackgroundEnabled ? color : undefined, borderRadius: override && a.customCornerRadiusEnabled ? `${a.cornerRadius}px` : undefined, fontSize: override ? `${a.bodyFontSize}px` : undefined, - '--secondary': override ? `${a.secondaryFontSize}px` : undefined, - '--emphasized': override ? `${a.emphasizedFontSize}px` : undefined, - '--large': override ? `${a.largeFontSize}px` : undefined, + '--ci-fs-secondary': override ? `${a.secondaryFontSize}px` : undefined, + '--ci-fs-body': override ? `${a.bodyFontSize}px` : undefined, + '--ci-fs-emphasized': override ? `${a.emphasizedFontSize}px` : undefined, + '--ci-fs-large': override ? `${a.largeFontSize}px` : undefined, '--rolling-duration': `${Math.max(1, 200 / n.settings.speed)}s`, flexDirection: container.value ? (n.settings.direction === 'vertical' ? 'column' : 'row') : undefined, gap: container.value ? `${n.settings.gap}px` : undefined, display: container.value ? 'flex' : undefined, + ...customText, }; }); @@ -298,9 +307,10 @@ const style = computed(() => { padding: 6px; flex-shrink: 0; position: relative; + color: var(--ci-text-1); } .component-node:not(.node-editing) { - line-height: 1.4; + line-height: var(--ci-line-height-body); } .clock { font-variant-numeric: tabular-nums; @@ -316,7 +326,7 @@ const style = computed(() => { flex-direction: row; align-items: center; justify-content: center; - gap: 6px; + gap: calc(var(--ci-component-gap) / 2); padding-bottom: 3px; } .lesson-line strong { @@ -326,10 +336,10 @@ const style = computed(() => { white-space: nowrap; } .lesson-line.current strong { - color: #fff; + color: var(--ci-text-1); } .lesson-line.break { - opacity: 0.86; + color: var(--ci-text-3); } .time-divider { display: block; @@ -344,19 +354,21 @@ const style = computed(() => { flex-shrink: 0; font-variant-numeric: tabular-nums; white-space: nowrap; + color: var(--ci-text-3); + font-size: var(--ci-fs-secondary); } .lesson-progress { position: absolute; inset: auto 0 0; - height: 2px; - background: #ffffff24; + height: var(--ci-progress-height); + background: var(--ci-fill-strong); overflow: hidden; - border-radius: 1px; + border-radius: calc(var(--ci-progress-height) / 3); } .lesson-progress i { display: block; height: 100%; - background: var(--island-accent, #60a5fa); + background: var(--island-accent, var(--ci-accent)); transform-origin: left; transition: transform 1s linear; } @@ -391,28 +403,26 @@ const style = computed(() => { animation: none; } .selected { - outline: 2px solid #85aaff; - border-radius: 8px; - background: #759cff14; + outline: 2px solid var(--ci-stroke-drag); + border-radius: var(--ci-radius-island); + background: var(--ci-accent-fill-tertiary); } .node-handle { touch-action: none; cursor: grab; display: block; - font: - 10px 'Microsoft YaHei', - sans-serif; + font: var(--ci-fw-normal) var(--ci-fs-version) / 1.2 var(--ci-font); padding: 3px 6px; border: 0; - border-radius: 4px; + border-radius: var(--ci-radius-control); min-height: 24px; margin-bottom: 4px; - color: #ffffff80; - background: #ffffff0d; + color: var(--ci-text-3); + background: var(--ci-fill-secondary); } .node-handle:hover { - background: #ffffff20; - color: #fff; + background: var(--ci-accent-soft); + color: var(--ci-text-1); } .notification, .homework, @@ -429,19 +439,19 @@ const style = computed(() => { cursor: pointer; } .node-editing:hover { - box-shadow: inset 0 0 0 1px #ffffff28; - border-radius: 8px; + box-shadow: inset 0 0 0 var(--ci-stroke-island-w) var(--ci-stroke-control); + border-radius: var(--ci-radius-island); } small { - font-size: var(--secondary, 12px); - opacity: 0.7; + color: var(--ci-text-3); + font-size: var(--ci-fs-secondary); } strong, .emphasized { - font-size: var(--emphasized, 20px); + font-size: var(--ci-fs-emphasized); } .large { - font-size: var(--large, 28px); + font-size: var(--ci-fs-large); } @keyframes rolling { from { @@ -453,4 +463,3 @@ strong, } - diff --git a/packages/desktop-client/src/island/CoursewareTransfer.vue b/packages/desktop-client/src/island/CoursewareTransfer.vue index 62344ce..f72b728 100644 --- a/packages/desktop-client/src/island/CoursewareTransfer.vue +++ b/packages/desktop-client/src/island/CoursewareTransfer.vue @@ -20,7 +20,8 @@ const style = computed(() => { : position.endsWith('right') ? { right: `${ISLAND_SHADOW_PAD}px` } : { left: '50%', transform: 'translateX(-50%)' }), - '--transfer-accent': props.appearance.accent, + '--ci-accent': props.appearance.resolvedAccent ?? props.appearance.accent, + '--transfer-accent': 'var(--ci-accent)', }; }); const status = computed( @@ -68,15 +69,12 @@ onUnmounted(() => window.removeEventListener('resize', report)); .courseware-transfer { position: fixed; box-sizing: border-box; - padding: 17px 24px; - border-radius: 24px; - color: white; - background: rgba(20, 20, 24, 0.97); - box-shadow: 0 2px 8px #0004; - font: - 13px/1.4 'Segoe UI', - 'Microsoft YaHei', - sans-serif; + padding: calc(var(--ci-popup-pad) + var(--ci-line-gap)) calc(var(--ci-popup-pad) * 2); + border-radius: var(--ci-radius-oobe-btn); + color: var(--ci-text-1); + background: color-mix(in srgb, var(--ci-bg-secondary) 97%, transparent); + box-shadow: var(--ci-shadow-island); + font: var(--ci-fw-normal) var(--ci-fs-control-base) / 1.4 var(--ci-font); overflow: hidden; pointer-events: none; } @@ -84,26 +82,26 @@ header, .metadata { display: flex; justify-content: space-between; - gap: 10px; + gap: calc(var(--ci-component-gap) * 0.8); } header { - color: #ffffffb8; - font-size: 12px; + color: var(--ci-text-2); + font-size: var(--ci-fs-caption); } header strong { color: var(--transfer-accent); } .filename { - font-weight: 600; - font-size: 16px; + font-weight: var(--ci-fw-semi-bold); + font-size: var(--ci-fs-title); margin: 5px 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .metadata { - color: #ffffffb8; - font-size: 12px; + color: var(--ci-text-2); + font-size: var(--ci-fs-caption); } progress { display: block; @@ -111,20 +109,20 @@ progress { height: 5px; margin-top: 11px; border: 0; - border-radius: 8px; + border-radius: var(--ci-radius-island); overflow: hidden; accent-color: var(--transfer-accent); } progress::-webkit-progress-bar { - background: #ffffff30; + background: var(--ci-fill-strong); } progress::-webkit-progress-value { background: var(--transfer-accent); } p { margin: 3px 0; - font-size: 11px; - color: #ffb4ab; + font-size: var(--ci-fs-caption); + color: var(--ci-warning-critical); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/desktop-client/src/island/CustomIslandRuntime.vue b/packages/desktop-client/src/island/CustomIslandRuntime.vue index 08e4fc8..429f733 100644 --- a/packages/desktop-client/src/island/CustomIslandRuntime.vue +++ b/packages/desktop-client/src/island/CustomIslandRuntime.vue @@ -4,6 +4,7 @@ import { ISLAND_SHADOW_PAD, PRIORITY_RANK, type IslandAppearance, + type IslandLayoutRow, type IslandLayoutSettings, type IslandState, type IslandTimePointDto, @@ -13,7 +14,6 @@ import { import ComponentNode from './ComponentNode.vue'; import ComponentIcon from './ComponentIcon.vue'; import ClassicNotifications from './ClassicNotifications.vue'; -import { squirclePath } from './squircle.js'; import { SpringValue } from './spring.js'; import LessonReminderContent from './LessonReminderContent.vue'; @@ -78,6 +78,33 @@ function fitted(size: { width: number; height: number }) { ); return { scale, width: Math.ceil(size.width * scale), height: Math.ceil(size.height * scale) }; } +/** 页面配置里的十六进制颜色转成背景 alpha;输入已由 shared 归一化。 */ +function withAlpha(hex: string, alpha: number): string { + return `color-mix(in srgb, ${hex} ${Math.min(1, Math.max(0, alpha)) * 100}%, transparent)`; +} +/** 自定义前景色必须写进颜色 alpha,不能用 opacity 连带淡化子元素与阴影。 */ +function foregroundVars(hex: string): Record { + return { + '--ci-text-1': hex, + '--ci-text-2': `color-mix(in srgb, ${hex} 85.5%, transparent)`, + '--ci-text-3': `color-mix(in srgb, ${hex} 77.3%, transparent)`, + '--ci-text-4': `color-mix(in srgb, ${hex} 52.9%, transparent)`, + '--ci-text-5': `color-mix(in srgb, ${hex} 36.5%, transparent)`, + }; +} +function rowStyle(row: IslandLayoutRow): Record { + const style: Record = { + '--row-gap': `${row.gap}px`, + opacity: String(row.opacity), + }; + if (row.fontOverridesEnabled) { + style['--ci-fs-secondary'] = `${row.secondaryFontSize}px`; + style['--ci-fs-body'] = `${row.bodyFontSize}px`; + style['--ci-fs-emphasized'] = `${row.emphasizedFontSize}px`; + style['--ci-fs-large'] = `${row.largeFontSize}px`; + } + return style; +} const compactFit = computed(() => fitted(natural.value.compact)); const detailsFit = computed(() => fitted(natural.value.details)); const lessonFit = computed(() => fitted(natural.value.lesson)); @@ -98,30 +125,44 @@ const progress = ref(0); const lessonProgress = ref(0); const compactAlpha = computed(() => Math.max(0, 1 - progress.value * 1.5) * (1 - lessonProgress.value)); const detailsAlpha = computed(() => progress.value * progress.value * (1 - lessonProgress.value)); -const path = computed(() => squirclePath(morph.value.width, morph.value.height, morph.value.radius)); -const style = computed(() => ({ - width: `${morph.value.width}px`, - height: `${morph.value.height}px`, - '--card-path': `path("${path.value}")`, - '--island-font': `${props.appearance.fontSize}px`, - '--island-accent': props.appearance.accent, - '--state-color': - props.state.active?.priority === 'URGENT' - ? '#ff453a' - : props.state.active?.kind === 'call' - ? '#ff9f0a' - : props.appearance.accent, - '--resident-background': 'var(--wn-bg)', - '--resident-radius': `${morph.value.radius}px`, - '--resident-scale': fit.value.scale, - '--custom-row-gap': `${scheme.value.spacing}px`, - '--resident-row-width': `${Math.max(60, available.value.width / scheme.value.scale - 58)}px`, - '--secondary': `${(props.appearance.fontSize / 13) * 14}px`, - '--emphasized': `${(props.appearance.fontSize / 13) * 18}px`, - '--large': `${(props.appearance.fontSize / 13) * 20}px`, - '--ci-body-font': `${(props.appearance.fontSize / 13) * 16}px`, - '--resident-fade-duration': motion.value ? `${200 / props.appearance.speed}ms` : '0ms', -})); +const style = computed(() => { + const current = scheme.value; + const background = lesson.value + ? 'transparent' + : expanded.value && messages.value.length + ? current.customForegroundEnabled + ? 'var(--ci-brand-dark)' + : 'var(--ci-bg-base)' + : current.customBackgroundEnabled + ? withAlpha(current.color, current.opacity) + : 'var(--ci-bg-secondary)'; + return { + width: `${morph.value.width}px`, + height: `${morph.value.height}px`, + '--island-font': `${current.bodyFontSize}px`, + '--ci-fs-secondary': `${current.secondaryFontSize}px`, + '--ci-fs-body': `${current.bodyFontSize}px`, + '--ci-fs-emphasized': `${current.emphasizedFontSize}px`, + '--ci-fs-large': `${current.largeFontSize}px`, + '--ci-font-weight': String(current.fontWeight), + '--ci-scale': String(current.scale), + '--ci-accent': props.appearance.resolvedAccent ?? props.appearance.accent, + '--state-color': + props.state.active?.priority === 'URGENT' + ? 'var(--ci-danger)' + : props.state.active?.kind === 'call' + ? 'var(--ci-warning-caution)' + : 'var(--ci-accent)', + '--resident-background': background, + '--resident-radius': `${morph.value.radius}px`, + '--resident-scale': fit.value.scale, + '--custom-row-gap': `${current.spacing}px`, + '--resident-row-width': `${Math.max(60, available.value.width / current.scale - 58)}px`, + '--ci-body-font': `${current.bodyFontSize}px`, + '--resident-fade-duration': motion.value ? `${200 / props.appearance.speed}ms` : '0ms', + ...(current.customForegroundEnabled ? foregroundVars(current.foreground) : {}), + }; +}); let morphFrame = 0; let morphFallback: ReturnType | undefined; function animate() { @@ -342,6 +383,16 @@ onUnmounted(() => { :data-bottom="appearance.position.startsWith('bottom')" @pointerdown.capture="pointer" > +