From the 2026-06-15 on-box hardware test (all 6 prior fixes confirmed; these are the new findings, baked into the fork source rather than shipped as pacman-hook patches, per the Phase-2 "we own the shell" approach): - F-W1 (Weather.qml): fetch at startup. Stock only called reload() on a config CHANGE, so a saved location blanked after reboot and an empty/auto location never populated on a fresh boot. Add Component.onCompleted: reload() and switch the hourly Timer to reload() (re-detects auto/IP too). - F-W3 (Weather.qml): 7-day forecast showed "undefined°" in °F mode — only maxTempC/minTempC were stored. Store rounded maxTempF/minTempF (and round °C). - F-W2 (Weather.qml): empty/auto-IP location never populated — the in-shell ipinfo.io fetch didn't set loc (provider-specific; the city path works via the same Requests.get). Repair attempt: defensive JSON parse + error callback + fallback to geojs.io. Compiled Requests module not inspectable, so this is best-effort; a saved city still works regardless. - F-D1a (modules/dashboard/*.qml): square the 25 card radii bound to the compiled Tokens.rounding.* Material defaults (which ignore shell.json rounding.scale=0) so the dashboard matches the square redesign. - F-D1b (Glyphs.qml): remap the weather glyphs to the Material-weather family (every codepoint verified present in JetBrainsMono Nerd Font Mono); the old Font-Awesome codepoints were absent (rendered "?") and thunderstorm / snowing_heavy were unmapped. - F-T1 (NsBar.qml): gate the system-tray pill on SystemTray.items count so it only shows when an app registers a tray icon (was opening an empty panel). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
199 lines
5.9 KiB
QML
199 lines
5.9 KiB
QML
pragma ComponentBehavior: Bound
|
|
|
|
import QtQuick
|
|
import QtQuick.Layouts
|
|
import Quickshell
|
|
import Quickshell.Widgets
|
|
import Caelestia
|
|
import Caelestia.Config
|
|
import qs.components
|
|
import qs.components.filedialog
|
|
|
|
Item {
|
|
id: root
|
|
|
|
required property DrawerVisibilities visibilities
|
|
required property DashboardState dashState
|
|
required property FileDialog facePicker
|
|
|
|
readonly property var dashboardTabs: {
|
|
const allTabs = [
|
|
{
|
|
component: dashComponent,
|
|
iconName: "dashboard",
|
|
text: qsTr("Dashboard"),
|
|
enabled: Config.dashboard.showDashboard
|
|
},
|
|
{
|
|
component: mediaComponent,
|
|
iconName: "queue_music",
|
|
text: qsTr("Media"),
|
|
enabled: Config.dashboard.showMedia
|
|
},
|
|
{
|
|
component: performanceComponent,
|
|
iconName: "speed",
|
|
text: qsTr("Performance"),
|
|
enabled: Config.dashboard.showPerformance
|
|
},
|
|
{
|
|
component: weatherComponent,
|
|
iconName: "cloud",
|
|
text: qsTr("Weather"),
|
|
enabled: Config.dashboard.showWeather
|
|
}
|
|
];
|
|
return allTabs.filter(tab => tab.enabled);
|
|
}
|
|
|
|
readonly property real nonAnimWidth: view.implicitWidth + viewWrapper.anchors.margins * 2
|
|
readonly property real nonAnimHeight: tabs.implicitHeight + tabs.anchors.topMargin + view.implicitHeight + viewWrapper.anchors.margins * 2
|
|
|
|
implicitWidth: nonAnimWidth
|
|
implicitHeight: nonAnimHeight
|
|
|
|
Tabs {
|
|
id: tabs
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: CUtils.clamp(anchors.margins - Config.border.thickness, 0, anchors.margins)
|
|
anchors.margins: Tokens.padding.large
|
|
|
|
nonAnimWidth: root.nonAnimWidth - anchors.margins * 2
|
|
dashState: root.dashState
|
|
tabs: root.dashboardTabs
|
|
}
|
|
|
|
ClippingRectangle {
|
|
id: viewWrapper
|
|
|
|
anchors.top: tabs.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
anchors.margins: Tokens.padding.large
|
|
|
|
radius: 0 // nosignal: square dashboard cards to match the redesign (F-D1)
|
|
color: "transparent"
|
|
|
|
Flickable {
|
|
id: view
|
|
|
|
readonly property int currentIndex: root.dashState.currentTab
|
|
readonly property Item currentItem: {
|
|
repeater.count; // Trigger update on count change
|
|
return repeater.itemAt(currentIndex);
|
|
}
|
|
|
|
anchors.fill: parent
|
|
|
|
flickableDirection: Flickable.HorizontalFlick
|
|
|
|
implicitWidth: currentItem?.implicitWidth ?? 0
|
|
implicitHeight: currentItem?.implicitHeight ?? 0
|
|
|
|
contentX: currentItem?.x ?? 0
|
|
contentWidth: row.implicitWidth
|
|
contentHeight: row.implicitHeight
|
|
|
|
onContentXChanged: {
|
|
if (!moving || !currentItem)
|
|
return;
|
|
|
|
const x = contentX - currentItem.x;
|
|
if (x > currentItem.implicitWidth / 2)
|
|
root.dashState.currentTab = Math.min(root.dashState.currentTab + 1, tabs.count - 1);
|
|
else if (x < -currentItem.implicitWidth / 2)
|
|
root.dashState.currentTab = Math.max(root.dashState.currentTab - 1, 0);
|
|
}
|
|
|
|
onDragEnded: {
|
|
if (!currentItem)
|
|
return;
|
|
|
|
const x = contentX - currentItem.x;
|
|
if (x > currentItem.implicitWidth / 10)
|
|
root.dashState.currentTab = Math.min(root.dashState.currentTab + 1, tabs.count - 1);
|
|
else if (x < -currentItem.implicitWidth / 10)
|
|
root.dashState.currentTab = Math.max(root.dashState.currentTab - 1, 0);
|
|
else
|
|
contentX = Qt.binding(() => currentItem?.x ?? 0);
|
|
}
|
|
|
|
RowLayout {
|
|
id: row
|
|
|
|
Repeater {
|
|
id: repeater
|
|
|
|
model: ScriptModel {
|
|
values: root.dashboardTabs
|
|
}
|
|
|
|
delegate: Loader {
|
|
id: paneLoader
|
|
|
|
required property int index
|
|
required property var modelData
|
|
|
|
Layout.alignment: Qt.AlignTop
|
|
|
|
sourceComponent: modelData.component
|
|
|
|
Component.onCompleted: active = Qt.binding(() => {
|
|
if (index === view.currentIndex)
|
|
return true;
|
|
const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
|
|
const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
|
|
return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
Component {
|
|
id: dashComponent
|
|
|
|
Dash {
|
|
visibilities: root.visibilities
|
|
dashState: root.dashState
|
|
facePicker: root.facePicker
|
|
}
|
|
}
|
|
|
|
Component {
|
|
id: mediaComponent
|
|
|
|
Media {
|
|
visibilities: root.visibilities
|
|
}
|
|
}
|
|
|
|
Component {
|
|
id: performanceComponent
|
|
|
|
Performance {}
|
|
}
|
|
|
|
Component {
|
|
id: weatherComponent
|
|
|
|
WeatherTab {}
|
|
}
|
|
|
|
Behavior on contentX {
|
|
Anim {}
|
|
}
|
|
}
|
|
}
|
|
|
|
Behavior on implicitWidth {
|
|
Anim {}
|
|
}
|
|
|
|
Behavior on implicitHeight {
|
|
Anim {}
|
|
}
|
|
}
|