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

revert popout lazy loaders

Browse Source
This commit is contained in:
bbedward
2025-08-13 18:06:27 -04:00
parent 37b97feeb0
commit 83c97eb245
4 changed files with 69 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Colors.qml
View File

@@ -145,13 +145,13 @@ Singleton {
id: matugenCollector
onStreamFinished: {
if (!matugenCollector.text) {
if (!text) {
ToastService.wallpaperErrorStatus = "error"
ToastService.showError("Wallpaper Processing Failed: Empty JSON extracted from matugen output.")
return
}
try {
root.matugenColors = JSON.parse(matugenCollector.text)
root.matugenColors = JSON.parse(text)
root.colorsUpdated()
generateAppConfigs()
ToastService.clearWallpaperError()

10
Modules/ControlCenter/NetworkTab.qml
View File

@@ -11,14 +11,8 @@ import qs.Modules.ControlCenter.Network
Item {
id: networkTab
property var wifiPasswordModalRef: {
wifiPasswordModalLoader.active = true
return wifiPasswordModalLoader.item
}
property var networkInfoModalRef: {
networkInfoModalLoader.active = true
return networkInfoModalLoader.item
}
property var wifiPasswordModalRef: wifiPasswordModal
property var networkInfoModalRef: networkInfoModal
property var sortedWifiNetworks: {
if (!NetworkService.wifiAvailable || !NetworkService.wifiEnabled) {

99
Modules/TopBar/TopBar.qml
View File

@@ -47,14 +47,6 @@ PanelWindow {
// Configure GPU temperature monitoring based on widget configuration
updateGpuTempConfig()
// Activate loaders needed for TopBar components
centcomPopoutLoader.active = true
processListPopoutLoader.active = true
notificationCenterLoader.active = true
batteryPopoutLoader.active = true
controlCenterLoader.active = true
appDrawerLoader.active = true
}
function updateGpuTempConfig() {
@@ -597,7 +589,7 @@ PanelWindow {
id: launcherButtonComponent
LauncherButton {
isActive: appDrawerLoader.item ? appDrawerLoader.item.isVisible : false
isActive: appDrawerPopout ? appDrawerPopout.isVisible : false
section: {
if (parent && parent.parent) {
if (parent.parent === leftSection)
@@ -609,12 +601,11 @@ PanelWindow {
}
return "left"
}
popupTarget: appDrawerLoader.item
popupTarget: appDrawerPopout
parentScreen: root.screen
onClicked: {
appDrawerLoader.active = true
if (appDrawerLoader.item)
appDrawerLoader.item.toggle()
if (appDrawerPopout)
appDrawerPopout.toggle()
}
}
}
@@ -650,13 +641,10 @@ PanelWindow {
return "center"
return "center"
}
popupTarget: centcomPopoutLoader.item
popupTarget: centcomPopout
parentScreen: root.screen
onClockClicked: {
centcomPopoutLoader.active = true
if (centcomPopoutLoader.item) {
centcomPopoutLoader.item.calendarVisible = !centcomPopoutLoader.item.calendarVisible
}
centcomPopout.calendarVisible = !centcomPopout.calendarVisible
}
}
}
@@ -675,13 +663,10 @@ PanelWindow {
return "center"
return "center"
}
popupTarget: centcomPopoutLoader.item
popupTarget: centcomPopout
parentScreen: root.screen
onClicked: {
centcomPopoutLoader.active = true
if (centcomPopoutLoader.item) {
centcomPopoutLoader.item.calendarVisible = !centcomPopoutLoader.item.calendarVisible
}
centcomPopout.calendarVisible = !centcomPopout.calendarVisible
}
}
}
@@ -699,13 +684,10 @@ PanelWindow {
return "center"
return "center"
}
popupTarget: centcomPopoutLoader.item
popupTarget: centcomPopout
parentScreen: root.screen
onClicked: {
centcomPopoutLoader.active = true
if (centcomPopoutLoader.item) {
centcomPopoutLoader.item.calendarVisible = !centcomPopoutLoader.item.calendarVisible
}
centcomPopout.calendarVisible = !centcomPopout.calendarVisible
}
}
}
@@ -749,12 +731,10 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: processListPopoutLoader.item
popupTarget: processListPopout
parentScreen: root.screen
toggleProcessList: () => {
processListPopoutLoader.active = true
if (processListPopoutLoader.item)
return processListPopoutLoader.item.toggle()
return processListPopout.toggle()
}
}
}
@@ -772,12 +752,10 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: processListPopoutLoader.item
popupTarget: processListPopout
parentScreen: root.screen
toggleProcessList: () => {
processListPopoutLoader.active = true
if (processListPopoutLoader.item)
return processListPopoutLoader.item.toggle()
return processListPopout.toggle()
}
}
}
@@ -795,12 +773,10 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: processListPopoutLoader.item
popupTarget: processListPopout
parentScreen: root.screen
toggleProcessList: () => {
processListPopoutLoader.active = true
if (processListPopoutLoader.item)
return processListPopoutLoader.item.toggle()
return processListPopout.toggle()
}
}
}
@@ -818,13 +794,11 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: processListPopoutLoader.item
popupTarget: processListPopout
parentScreen: root.screen
widgetData: parent.widgetData
toggleProcessList: () => {
processListPopoutLoader.active = true
if (processListPopoutLoader.item)
return processListPopoutLoader.item.toggle()
return processListPopout.toggle()
}
}
}
@@ -834,7 +808,7 @@ PanelWindow {
NotificationCenterButton {
hasUnread: root.notificationCount > 0
isActive: notificationCenterLoader.item ? notificationCenterLoader.item.notificationHistoryVisible : false
isActive: notificationCenter.notificationHistoryVisible
section: {
if (parent && parent.parent === leftSection)
return "left"
@@ -844,14 +818,11 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: notificationCenterLoader.item
popupTarget: notificationCenter
parentScreen: root.screen
onClicked: {
notificationCenterLoader.active = true
if (notificationCenterLoader.item) {
notificationCenterLoader.item.notificationHistoryVisible
= !notificationCenterLoader.item.notificationHistoryVisible
}
notificationCenter.notificationHistoryVisible
= !notificationCenter.notificationHistoryVisible
}
}
}
@@ -860,7 +831,7 @@ PanelWindow {
id: batteryComponent
Battery {
batteryPopupVisible: batteryPopoutLoader.item ? batteryPopoutLoader.item.batteryPopupVisible : false
batteryPopupVisible: batteryPopout.batteryPopupVisible
section: {
if (parent && parent.parent === leftSection)
return "left"
@@ -870,13 +841,10 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: batteryPopoutLoader.item
popupTarget: batteryPopout
parentScreen: root.screen
onToggleBatteryPopup: {
batteryPopoutLoader.active = true
if (batteryPopoutLoader.item) {
batteryPopoutLoader.item.batteryPopupVisible = !batteryPopoutLoader.item.batteryPopupVisible
}
batteryPopout.batteryPopupVisible = !batteryPopout.batteryPopupVisible
}
}
}
@@ -885,7 +853,7 @@ PanelWindow {
id: controlCenterButtonComponent
ControlCenterButton {
isActive: controlCenterLoader.item ? controlCenterLoader.item.controlCenterVisible : false
isActive: controlCenterPopout.controlCenterVisible
section: {
if (parent && parent.parent === leftSection)
return "left"
@@ -895,17 +863,14 @@ PanelWindow {
return "center"
return "right"
}
popupTarget: controlCenterLoader.item
popupTarget: controlCenterPopout
parentScreen: root.screen
onClicked: {
controlCenterLoader.active = true
if (controlCenterLoader.item) {
controlCenterLoader.item.triggerScreen = root.screen
controlCenterLoader.item.controlCenterVisible = !controlCenterLoader.item.controlCenterVisible
if (controlCenterLoader.item.controlCenterVisible) {
if (NetworkService.wifiEnabled)
NetworkService.scanWifi()
}
controlCenterPopout.triggerScreen = root.screen
controlCenterPopout.controlCenterVisible = !controlCenterPopout.controlCenterVisible
if (controlCenterPopout.controlCenterVisible) {
if (NetworkService.wifiEnabled)
NetworkService.scanWifi()
}
}
}

134
shell.qml
View File

@@ -42,50 +42,25 @@ ShellRoot {
delegate: Dock {
modelData: item
contextMenu: dockContextMenuLoader.item ? dockContextMenuLoader.item : null
windowsMenu: dockWindowsMenuLoader.item ? dockWindowsMenuLoader.item : null
Component.onCompleted: {
dockContextMenuLoader.active = true
dockWindowsMenuLoader.active = true
}
contextMenu: dockContextMenu
windowsMenu: dockWindowsMenu
}
}
LazyLoader {
id: centcomPopoutLoader
active: false
CentcomPopout {
id: centcomPopout
}
CentcomPopout {
id: centcomPopout
}
LazyLoader {
id: dockContextMenuLoader
active: false
DockContextMenu {
id: dockContextMenu
}
DockContextMenu {
id: dockContextMenu
}
LazyLoader {
id: dockWindowsMenuLoader
active: false
DockWindowsMenu {
id: dockWindowsMenu
}
DockWindowsMenu {
id: dockWindowsMenu
}
LazyLoader {
id: notificationCenterLoader
active: false
NotificationCenterPopout {
id: notificationCenter
}
NotificationCenterPopout {
id: notificationCenter
}
Variants {
@@ -96,93 +71,50 @@ ShellRoot {
}
}
LazyLoader {
id: controlCenterLoader
active: false
ControlCenterPopout {
id: controlCenterPopout
ControlCenterPopout {
id: controlCenterPopout
onPowerActionRequested: (action, title, message) => {
powerConfirmModalLoader.active = true
if (powerConfirmModalLoader.item) {
powerConfirmModalLoader.item.powerConfirmAction = action
powerConfirmModalLoader.item.powerConfirmTitle = title
powerConfirmModalLoader.item.powerConfirmMessage = message
powerConfirmModalLoader.item.powerConfirmVisible = true
}
onPowerActionRequested: (action, title, message) => {
powerConfirmModal.powerConfirmAction = action
powerConfirmModal.powerConfirmTitle = title
powerConfirmModal.powerConfirmMessage = message
powerConfirmModal.powerConfirmVisible = true
}
onLockRequested: {
lock.activate()
}
onLockRequested: {
lock.activate()
}
}
LazyLoader {
id: wifiPasswordModalLoader
active: false
WifiPasswordModal {
id: wifiPasswordModal
}
WifiPasswordModal {
id: wifiPasswordModal
}
LazyLoader {
id: networkInfoModalLoader
active: false
NetworkInfoModal {
id: networkInfoModal
}
NetworkInfoModal {
id: networkInfoModal
}
LazyLoader {
id: batteryPopoutLoader
active: false
BatteryPopout {
id: batteryPopout
}
BatteryPopout {
id: batteryPopout
}
LazyLoader {
id: powerMenuLoader
active: false
PowerMenu {
id: powerMenu
}
PowerMenu {
id: powerMenu
}
LazyLoader {
id: powerConfirmModalLoader
active: false
PowerConfirmModal {
id: powerConfirmModal
}
PowerConfirmModal {
id: powerConfirmModal
}
LazyLoader {
id: processListPopoutLoader
active: false
ProcessListPopout {
id: processListPopout
}
ProcessListPopout {
id: processListPopout
}
SettingsModal {
id: settingsModal
}
LazyLoader {
id: appDrawerLoader
active: false
AppDrawerPopout {
id: appDrawerPopout
}
AppDrawerPopout {
id: appDrawerPopout
}
SpotlightModal {