From fb18d01c7decc2c3d27a0ed3f0f2874ff3e8a094 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Mon, 16 Nov 2026 22:59:03 -0800 Subject: [PATCH] fix(settings): give loose settings rows room around the jump highlight (#43492) A settings row with no card around it had no edges for the tint to bleed to, so the highlight stopped a few pixels from its text. Such rows now grow a rounded 10px halo in the same tint, fading with it; rows inside cards and highlighted cards keep their current look. --- src/renderer/src/assets/main.css | 17 ++++++++++++---- .../settings-target-highlight.ts | 20 ++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index 25db24d1815..665bfbd7db9 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -2319,13 +2319,20 @@ html.native-shell .app-layout { /* Search and deep-link target: a tint out to the enclosing card's edges that fades. An inset shadow carries the tint so a highlighted card keeps its own fill and corners. - The bleed vars are measured per target, since nested and sub-row targets sit further in. */ + The bleed vars are measured per target, since nested and sub-row targets sit further in. + A row with no card around it grows a rounded halo instead, so the tint clears its text. */ .settings-target-highlight { --settings-target-tint: color-mix(in srgb, var(--foreground) 8%, transparent); box-shadow: inset 0 0 0 100vmax var(--settings-target-tint), calc(-1 * var(--settings-target-bleed-left, 0px)) 0 0 var(--settings-target-tint), - var(--settings-target-bleed-right, 0px) 0 0 var(--settings-target-tint); + var(--settings-target-bleed-right, 0px) 0 0 var(--settings-target-tint), + 0 0 0 var(--settings-target-halo, 0px) var(--settings-target-tint); +} + +.settings-target-highlight[data-settings-target-loose] { + --settings-target-halo: 10px; + border-radius: var(--radius-md); } [data-settings-scroll-list] .settings-target-highlight { @@ -2344,13 +2351,15 @@ html.native-shell .app-layout { box-shadow: inset 0 0 0 100vmax var(--settings-target-tint), calc(-1 * var(--settings-target-bleed-left, 0px)) 0 0 var(--settings-target-tint), - var(--settings-target-bleed-right, 0px) 0 0 var(--settings-target-tint); + var(--settings-target-bleed-right, 0px) 0 0 var(--settings-target-tint), + 0 0 0 var(--settings-target-halo, 0px) var(--settings-target-tint); } 100% { box-shadow: inset 0 0 0 100vmax transparent, calc(-1 * var(--settings-target-bleed-left, 0px)) 0 0 transparent, - var(--settings-target-bleed-right, 0px) 0 0 transparent; + var(--settings-target-bleed-right, 0px) 0 0 transparent, + 0 0 0 var(--settings-target-halo, 0px) transparent; } } diff --git a/src/renderer/src/components/settings/section-layout/settings-target-highlight.ts b/src/renderer/src/components/settings/section-layout/settings-target-highlight.ts index 6e1787c1ab7..d13eb79173e 100644 --- a/src/renderer/src/components/settings/section-layout/settings-target-highlight.ts +++ b/src/renderer/src/components/settings/section-layout/settings-target-highlight.ts @@ -16,6 +16,15 @@ export function parseSettingsTitleTargetId(targetId: string): string | null { } const SETTINGS_GROUP_CARD_SELECTOR = '[data-settings-group-card]' +const SETTINGS_TARGET_LOOSE_ATTRIBUTE = 'data-settings-target-loose' + +function isBorderedSettingsCard(element: HTMLElement): boolean { + const style = getComputedStyle(element) + return ( + Number.parseFloat(style.borderLeftWidth) > 0 && + Number.parseFloat(style.borderTopLeftRadius) >= 8 + ) +} // Rows sit at different insets (nested rows, sub-fields), so measure the gap from the row to // its card's inner edges instead of assuming one gutter. @@ -25,11 +34,7 @@ function findEnclosingSettingsCard(element: HTMLElement): HTMLElement | null { return groupCard } for (let node = element.parentElement; node; node = node.parentElement) { - const style = getComputedStyle(node) - if ( - Number.parseFloat(style.borderLeftWidth) > 0 && - Number.parseFloat(style.borderTopLeftRadius) >= 8 - ) { + if (isBorderedSettingsCard(node)) { return node } } @@ -52,6 +57,10 @@ export function applySettingsTargetHighlightBleed(target: HTMLElement): void { } const card = findEnclosingSettingsCard(target) if (!card) { + // No card edges to bleed to, so CSS grows a halo; a highlighted card keeps its own edges. + if (!target.matches(SETTINGS_GROUP_CARD_SELECTOR) && !isBorderedSettingsCard(target)) { + target.setAttribute(SETTINGS_TARGET_LOOSE_ATTRIBUTE, '') + } return } const cardRect = card.getBoundingClientRect() @@ -66,6 +75,7 @@ export function applySettingsTargetHighlightBleed(target: HTMLElement): void { export function clearSettingsTargetHighlightBleed(target: HTMLElement): void { target.style.removeProperty('--settings-target-bleed-left') target.style.removeProperty('--settings-target-bleed-right') + target.removeAttribute(SETTINGS_TARGET_LOOSE_ATTRIBUTE) } const SETTINGS_TARGET_REVEAL_EVENT = 'orca-settings-target-reveal'