Files
qbz/crates/qbz-slint/ui/primitives/SecondaryButton.slint
T
vicrodh 88f1967d8a fix(slint): single click on button primitives (FocusScope stole the first press)
Slint hit-tests sibling children in reverse declaration order, so the
keyboard FocusScope declared after the pointer TouchArea was visited
first and, with the default focus-on-click, consumed the first Pressed
just to grab focus — aborting traversal before the TouchArea, so every
button needed two clicks. Set focus-on-click: false on the FocusScope in
QbzPrimaryButton, SecondaryButton, QbzCheckbox, QbzToggle, ToggleButton
and QbzSelect; the press now reaches the TouchArea on the first click
(Tab/Enter/Space activation unaffected).

cc
2026-06-22 21:34:59 -06:00

81 lines
2.9 KiB
Plaintext

// Labeled SECONDARY button — the subdued sibling of QbzPrimaryButton, used for
// Cancel / Back actions. Promoted to a shared primitive from the inline copy in
// AppearanceSettings so the My QBZ modals + the Discography Builder footer read
// identically (the button audit, spec 12c). A bordered surface-elevated chip
// with a centered label; `enabled` dims + gates the click.
//
// Default 160px width matches AppearanceSettings; callers that need an
// auto-width chip (the right-aligned modal footers) set `width` explicitly.
import { Theme } from "../foundation/semantic-colors.slint";
import { Radius } from "../foundation/radius.slint";
import { Typography } from "../foundation/typography.slint";
export component SecondaryButton inherits Rectangle {
in property <string> label;
in property <bool> enabled: true;
callback clicked();
height: 34px;
border-radius: Radius.sm;
border-width: 1px;
border-color: Theme.border-subtle;
background: ta.has-hover && root.enabled ? Theme.surface-hover : Theme.surface-elevated;
opacity: root.enabled ? 1.0 : 0.4;
// Padded layout → preferred-width = label + 16px each side, so the button
// auto-sizes as a footer chip; AppearanceSettings sets `width: 160px`
// explicitly to keep its original fixed footprint.
HorizontalLayout {
alignment: center;
padding-left: 16px;
padding-right: 16px;
Text {
text: root.label;
color: Theme.text-secondary;
font-size: Typography.body;
font-weight: Typography.medium;
horizontal-alignment: center;
vertical-alignment: center;
}
}
ta := TouchArea {
mouse-cursor: root.enabled ? pointer : default;
clicked => {
if (root.enabled) {
root.clicked();
}
}
}
// Keyboard activation: Enter/Space fire the same click. `focus-on-click:
// false` is LOAD-BEARING — see QbzPrimaryButton: Slint hit-tests siblings in
// reverse declaration order, so this FocusScope (after `ta`) would otherwise
// eat the first Pressed to grab focus, requiring a second click. Disabling
// click-focus lets the press fall through to `ta` (Tab/Enter/Space stay).
fs := FocusScope {
enabled: root.enabled;
focus-on-click: false;
key-pressed(event) => {
if (event.text == Key.Return || event.text == " ") {
root.clicked();
return accept;
}
return reject;
}
}
// Non-layout focus ring — transparent-bordered overlay shown only on
// keyboard focus, so it never reflows the button.
Rectangle {
x: 0;
y: 0;
width: parent.width;
height: parent.height;
background: transparent;
border-width: 2px;
border-color: fs.has-focus ? Theme.focus-ring : transparent;
border-radius: parent.border-radius;
}
}