Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

remove old remnants from when it was just a calendar

Browse Source
This commit is contained in:
bbedward
2025-09-09 23:01:21 -04:00
parent 5a9c80540e
commit e5083fb3a4
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/DankDash/DankDashPopout.qml
View File

@@ -12,7 +12,7 @@ import qs.Modules.DankDash
DankPopout {
id: root
property bool calendarVisible: false
property bool dashVisible: false
property string triggerSection: "center"
property var triggerScreen: null
property int currentTabIndex: 0
@@ -38,11 +38,11 @@ DankPopout {
triggerWidth: 80
positioning: "center"
screen: triggerScreen
shouldBeVisible: calendarVisible
shouldBeVisible: dashVisible
visible: shouldBeVisible
onCalendarVisibleChanged: {
if (calendarVisible) {
onDashVisibleChanged: {
if (dashVisible) {
open()
} else {
close()
@@ -50,7 +50,7 @@ DankPopout {
}
onBackgroundClicked: {
calendarVisible = false
dashVisible = false
}
content: Component {
@@ -70,7 +70,7 @@ DankPopout {
Keys.onPressed: function(event) {
if (event.key === Qt.Key_Escape) {
root.close()
root.dashVisible = false
event.accepted = true
}
}

6
Modules/TopBar/TopBar.qml
View File

@@ -685,7 +685,7 @@ PanelWindow {
onClockClicked: {
dankDashPopoutLoader.active = true
if (dankDashPopoutLoader.item) {
dankDashPopoutLoader.item.calendarVisible = !dankDashPopoutLoader.item.calendarVisible
dankDashPopoutLoader.item.dashVisible = !dankDashPopoutLoader.item.dashVisible
dankDashPopoutLoader.item.currentTabIndex = 0 // Overview tab
}
}
@@ -708,7 +708,7 @@ PanelWindow {
onClicked: {
dankDashPopoutLoader.active = true
if (dankDashPopoutLoader.item) {
dankDashPopoutLoader.item.calendarVisible = !dankDashPopoutLoader.item.calendarVisible
dankDashPopoutLoader.item.dashVisible = !dankDashPopoutLoader.item.dashVisible
dankDashPopoutLoader.item.currentTabIndex = 1 // Media tab
}
}
@@ -730,7 +730,7 @@ PanelWindow {
onClicked: {
dankDashPopoutLoader.active = true
if (dankDashPopoutLoader.item) {
dankDashPopoutLoader.item.calendarVisible = !dankDashPopoutLoader.item.calendarVisible
dankDashPopoutLoader.item.dashVisible = !dankDashPopoutLoader.item.dashVisible
dankDashPopoutLoader.item.currentTabIndex = 2 // Weather tab
}
}

15
shell.qml
View File

@@ -72,11 +72,6 @@ ShellRoot {
sourceComponent: Component {
DankDashPopout {
id: dankDashPopout
// Ensure it starts invisible
Component.onCompleted: {
calendarVisible = false
}
}
}
}
@@ -408,7 +403,7 @@ ShellRoot {
break
}
dankDashPopoutLoader.item.setTriggerPosition(Screen.width / 2, Theme.barHeight + Theme.spacingS, 100, "center", Screen)
dankDashPopoutLoader.item.calendarVisible = true
dankDashPopoutLoader.item.dashVisible = true
return "DASH_OPEN_SUCCESS"
}
return "DASH_OPEN_FAILED"
@@ -416,7 +411,7 @@ ShellRoot {
function close(): string {
if (dankDashPopoutLoader.item) {
dankDashPopoutLoader.item.calendarVisible = false
dankDashPopoutLoader.item.dashVisible = false
return "DASH_CLOSE_SUCCESS"
}
return "DASH_CLOSE_FAILED"
@@ -425,8 +420,8 @@ ShellRoot {
function toggle(tab: string): string {
dankDashPopoutLoader.active = true
if (dankDashPopoutLoader.item) {
if (dankDashPopoutLoader.item.calendarVisible) {
dankDashPopoutLoader.item.calendarVisible = false
if (dankDashPopoutLoader.item.dashVisible) {
dankDashPopoutLoader.item.dashVisible = false
} else {
switch (tab.toLowerCase()) {
case "media":
@@ -440,7 +435,7 @@ ShellRoot {
break
}
dankDashPopoutLoader.item.setTriggerPosition(Screen.width / 2, Theme.barHeight + Theme.spacingS, 100, "center", Screen)
dankDashPopoutLoader.item.calendarVisible = true
dankDashPopoutLoader.item.dashVisible = true
}
return "DASH_TOGGLE_SUCCESS"
}