Toggle panel heroes with a switch instead of the status icon (#6408)
* Add Tailscale header on/off toggle * Address Tailscale toggle review feedback * Hide Tailscale tooltip while busy * Keep Tailscale labels clear of header toggle * Extract the switch from Toggle into a reusable ToggleSwitch Toggle rendered its own track and knob inline, so anything else wanting a switch had to copy the geometry. Pull it into Ui/ToggleSwitch.qml and let Toggle compose it, and give PanelHero a trailingControl slot so a hero can pin a control to its trailing edge without the caller doing the layout. The switch draws its cursor as a ring outside the track: themes give normal chrome a stronger border than hover-cursor, which is right for controls that are borderless at rest but would make a bordered track go fainter under the cursor. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Keep the panel cursor on the virtual header section clampCursor resets focusSection whenever it is not in visibleSections, but "header" is virtual and never appears there. Any refresh of the underlying model therefore threw the cursor off the hero toggle: muting republishes the PipeWire snapshot, and toggling the Bluetooth adapter empties and refills the device lists. moveCursor already special-cases "header"; clampCursor now does too. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Toggle panel heroes with a switch instead of the status icon The hero icon doubled as the on/off control, which was invisible as an affordance and made the icon carry two jobs at once. Give Tailscale, Dropbox, Bluetooth, Audio, and Network a ToggleSwitch on the trailing edge of the hero and leave the icon to report status. The switch is the header's only cursor target, so the keyboard reaches it the same way the mouse does. Dropping the icon's focus ring also drops heroRingPad, which lets each hero line up with the rows beneath it. Network's link detail moves inline after the name -- "Ethernet (2.5gbit)" -- since the pill crowded the switch. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Make the network hero switch honestly a Wi-Fi switch The switch reads and writes Networking.wifiEnabled, but its tooltip claimed to turn "network" on and off whenever Ethernet was the active connection. A click asserted nothing; a switch asserts state, so on a wired machine with the radio off it sat there reading "off" beside a perfectly live Ethernet connection. Say Wi-Fi, and only offer the switch when there is a radio to switch. headerActionCount follows the same condition so the keyboard cannot reach a control that is not there. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Stop the header cursor claiming an absent switch The switch hides when the thing it toggles is unavailable -- no Tailscale CLI, no Dropbox CLI, no Wi-Fi radio -- but "header" stayed reachable, so the cursor could sit on a target that never rendered. The old clickable icon was always on screen, so there was always something to highlight. "header" stays navigable and Enter still no-ops safely; the cursor just stops claiming a spot that is not there. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Wrap the gallery's switch caption The caption sat unbounded inside the switch row. The gallery has a 560px minimum width, horizontal scrolling off, and clipping on, so at that size the end of the line was simply unreachable. Move it below the row and wrap it, the way every other description in the gallery already does. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Tobias Lütke
co-authored by
Claude Opus 5
David Heinemeier Hansson
Claude Opus 5
David Heinemeier Hansson
parent
1d38842c3e
commit
4cfb2c2fae
@@ -109,9 +109,16 @@ Panel {
|
||||
property int headerIndex: 0
|
||||
readonly property bool canDisconnect: !!connectedWifiNetwork
|
||||
readonly property bool headerHasDisconnect: false
|
||||
readonly property int headerActionCount: networkManagerAvailable ? 1 : 0
|
||||
readonly property bool headerHasCursor: cursorActive && focusSection === "header"
|
||||
readonly property int heroRingPad: Style.space(6)
|
||||
// The hero switch is the Wi-Fi radio and nothing else, so it only exists
|
||||
// when there is a radio to switch. A click carried no state, but a switch
|
||||
// asserts one: on a wired box it would otherwise sit there reading "off"
|
||||
// beside a perfectly live Ethernet connection.
|
||||
readonly property bool canToggleWifi: networkManagerAvailable && wifiStationAvailable
|
||||
readonly property int headerActionCount: canToggleWifi ? 1 : 0
|
||||
// Only claim the header cursor when the switch is actually on screen —
|
||||
// "header" stays navigable, but a machine with no radio has nothing to highlight.
|
||||
readonly property bool headerHasCursor: cursorActive && focusSection === "header" && canToggleWifi
|
||||
readonly property string toggleHint: Networking.wifiEnabled ? "Turn Wi-Fi off" : "Turn Wi-Fi on"
|
||||
readonly property var dnsProviders: ["DHCP", "Cloudflare", "Google", "Custom"]
|
||||
property int dnsIndex: 0
|
||||
|
||||
@@ -855,19 +862,9 @@ Panel {
|
||||
// ---------- Hero: network icon · SSID + state · actions ----------
|
||||
Item {
|
||||
width: parent.width
|
||||
implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight) + root.heroRingPad * 2
|
||||
|
||||
// Keyboard focus ring around the hero Wi-Fi toggle. heroIcon is inset
|
||||
// by heroRingPad so this ring stays inside the panel's clip box.
|
||||
BorderSurface {
|
||||
anchors.fill: heroIcon
|
||||
anchors.margins: -root.heroRingPad
|
||||
color: "transparent"
|
||||
radius: Style.cornerRadius
|
||||
visible: root.headerHasCursor
|
||||
borderSpec: Border.controlSpec("hover-cursor", root.bar.foreground, Color.accent)
|
||||
}
|
||||
implicitHeight: Math.max(heroIcon.implicitHeight, heroLabels.implicitHeight, powerSwitch.implicitHeight)
|
||||
|
||||
// Status only — the switch owns toggling, mouse and keyboard alike.
|
||||
Text {
|
||||
id: heroIcon
|
||||
text: root.icon
|
||||
@@ -876,25 +873,25 @@ Panel {
|
||||
font.pixelSize: Style.font.display
|
||||
opacity: root.networkManagerAvailable ? 1.0 : 0.5
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: root.heroRingPad
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: heroIconMouse
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
enabled: root.networkManagerAvailable
|
||||
onContainsMouseChanged: if (containsMouse) root.setHeaderCursor()
|
||||
onClicked: {
|
||||
Networking.wifiEnabled = !Networking.wifiEnabled
|
||||
Qt.callLater(function() { root.refresh(true) })
|
||||
}
|
||||
}
|
||||
// Compact on/off switch on the trailing edge of the hero, and the
|
||||
// header's only cursor target.
|
||||
ToggleSwitch {
|
||||
id: powerSwitch
|
||||
visible: root.canToggleWifi
|
||||
checked: Networking.wifiEnabled
|
||||
hasCursor: root.headerHasCursor
|
||||
foreground: root.bar.foreground
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onHovered: function(on) { if (on) root.setHeaderCursor() }
|
||||
onToggled: root.toggleNetwork()
|
||||
|
||||
PanelToolTip {
|
||||
visible: heroIconMouse.containsMouse
|
||||
text: root.info.type === "ethernet" ? "Toggle network" : "Toggle Wi-Fi"
|
||||
visible: powerSwitch.containsMouse
|
||||
text: root.toggleHint
|
||||
fontFamily: root.bar.fontFamily
|
||||
}
|
||||
}
|
||||
@@ -904,10 +901,13 @@ Panel {
|
||||
anchors.left: heroIcon.right
|
||||
anchors.leftMargin: Style.space(14)
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: powerSwitch.visible ? powerSwitch.width + Style.space(12) : 0
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
spacing: Style.space(2)
|
||||
|
||||
Row {
|
||||
// Link detail rides inline after the name — "Ethernet (2.5gbit)" —
|
||||
// rather than in a pill, which crowded the on/off switch.
|
||||
Text {
|
||||
id: heroSsid
|
||||
width: parent.width
|
||||
|
||||
@@ -918,38 +918,12 @@ Panel {
|
||||
}
|
||||
readonly property string detail: root.headerDetail()
|
||||
|
||||
Text {
|
||||
text: heroSsid.title
|
||||
width: Math.min(implicitWidth, Math.max(0, parent.width - (heroDetailPill.visible ? heroDetailPill.implicitWidth + Style.space(8) : 0)))
|
||||
color: root.bar.foreground
|
||||
font.family: root.bar.fontFamily
|
||||
font.pixelSize: Style.font.title
|
||||
font.bold: true
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
Item { width: Math.max(0, parent.width - parent.children[0].width - heroDetailPill.implicitWidth); height: 1 }
|
||||
|
||||
BorderSurface {
|
||||
id: heroDetailPill
|
||||
visible: heroSsid.detail !== ""
|
||||
implicitWidth: heroDetail.implicitWidth + Style.space(10)
|
||||
implicitHeight: heroDetail.implicitHeight + Style.space(4)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: "transparent"
|
||||
borderSpec: Border.controlSpec("normal", root.bar.foreground, Color.accent)
|
||||
radius: Style.cornerRadius
|
||||
|
||||
Text {
|
||||
id: heroDetail
|
||||
anchors.centerIn: parent
|
||||
text: heroSsid.detail
|
||||
color: Qt.darker(root.bar.foreground, 1.4)
|
||||
font.family: root.bar.fontFamily
|
||||
font.pixelSize: Style.font.body
|
||||
font.bold: true
|
||||
}
|
||||
}
|
||||
text: heroSsid.detail !== "" ? heroSsid.title + " (" + heroSsid.detail + ")" : heroSsid.title
|
||||
color: root.bar.foreground
|
||||
font.family: root.bar.fontFamily
|
||||
font.pixelSize: Style.font.title
|
||||
font.bold: true
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
Text {
|
||||
|
||||
Reference in New Issue
Block a user