diff --git a/Modules/DankDash/DankDashPopout.qml b/Modules/DankDash/DankDashPopout.qml index 13675c8c..63cc8d23 100644 --- a/Modules/DankDash/DankDashPopout.qml +++ b/Modules/DankDash/DankDashPopout.qml @@ -37,10 +37,10 @@ DankPopout { triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingS triggerWidth: 80 positioning: "center" - screen: triggerScreen shouldBeVisible: dashVisible visible: shouldBeVisible + onDashVisibleChanged: { if (dashVisible) { open() @@ -172,6 +172,13 @@ DankPopout { OverviewTab { id: overviewTab + + onSwitchToWeatherTab: { + if (SettingsData.weatherEnabled) { + tabBar.currentIndex = 2 + tabBar.tabClicked(2) + } + } } MediaPlayerTab { diff --git a/Modules/DankDash/Overview/WeatherOverviewCard.qml b/Modules/DankDash/Overview/WeatherOverviewCard.qml index 613955d9..00a2e526 100644 --- a/Modules/DankDash/Overview/WeatherOverviewCard.qml +++ b/Modules/DankDash/Overview/WeatherOverviewCard.qml @@ -8,6 +8,8 @@ import qs.Widgets Card { id: root + signal clicked() + Component.onCompleted: WeatherService.addRef() Component.onDestruction: WeatherService.removeRef() @@ -79,4 +81,11 @@ Card { } } } + + MouseArea { + anchors.fill: parent + hoverEnabled: true + cursorShape: Qt.PointingHandCursor + onClicked: root.clicked() + } } \ No newline at end of file diff --git a/Modules/DankDash/OverviewTab.qml b/Modules/DankDash/OverviewTab.qml index 134ab053..51c85e0f 100644 --- a/Modules/DankDash/OverviewTab.qml +++ b/Modules/DankDash/OverviewTab.qml @@ -12,6 +12,8 @@ Item { implicitWidth: 700 implicitHeight: 410 + signal switchToWeatherTab() + Item { anchors.fill: parent // Clock - top left (narrower and shorter) @@ -29,6 +31,8 @@ Item { width: SettingsData.weatherEnabled ? parent.width * 0.3 : 0 height: 100 visible: SettingsData.weatherEnabled + + onClicked: root.switchToWeatherTab() } // UserInfo - top middle-right (extend when weather disabled)