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

Revert "potential topbar loading fix"

Browse Source 
This reverts commit 22780e40b1.
This commit is contained in:
bbedward
2025-08-15 12:19:06 -04:00
parent 22780e40b1
commit 02202efbba
1 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Modules/TopBar/TopBar.qml
View File

@@ -362,23 +362,16 @@ PanelWindow {
Repeater { Repeater {
model: SettingsData.topBarLeftWidgetsModel model: SettingsData.topBarLeftWidgetsModel
Item { Loader {
property string widgetId: model.widgetId property string widgetId: model.widgetId
property var widgetData: model property var widgetData: model
property int spacerSize: model.size || 20 property int spacerSize: model.size || 20
anchors.verticalCenter: parent ? parent.verticalCenter : undefined anchors.verticalCenter: parent ? parent.verticalCenter : undefined
width: loader.width active: topBarContent.getWidgetVisible(model.widgetId)
height: loader.height sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
opacity: topBarContent.getWidgetEnabled(model.enabled) ? 1 : 0
Loader { asynchronous: true
id: loader
anchors.verticalCenter: parent.verticalCenter
active: topBarContent.getWidgetVisible(parent.widgetId)
sourceComponent: topBarContent.getWidgetComponent(parent.widgetId)
opacity: topBarContent.getWidgetEnabled(parent.widgetData.enabled !== undefined ? parent.widgetData.enabled : true) ? 1 : 0
asynchronous: true
}
} }
} }
} }
@@ -403,10 +396,10 @@ PanelWindow {
totalWidth = 0 totalWidth = 0
for (var i = 0; i < centerRepeater.count; i++) { for (var i = 0; i < centerRepeater.count; i++) {
let item = centerRepeater.itemAt(i) let item = centerRepeater.itemAt(i)
if (item && item.loader && item.loader.active && item.loader.item) { if (item && item.active && item.item) {
centerWidgets.push(item.loader.item) centerWidgets.push(item.item)
totalWidgets++ totalWidgets++
totalWidth += item.loader.item.width totalWidth += item.item.width
} }
} }
if (totalWidgets > 1) if (totalWidgets > 1)
@@ -490,38 +483,30 @@ PanelWindow {
model: SettingsData.topBarCenterWidgetsModel model: SettingsData.topBarCenterWidgetsModel
Item { Loader {
property string widgetId: model.widgetId property string widgetId: model.widgetId
property var widgetData: model property var widgetData: model
property int spacerSize: model.size || 20 property int spacerSize: model.size || 20
property alias loader: loader
anchors.verticalCenter: parent ? parent.verticalCenter : undefined anchors.verticalCenter: parent ? parent.verticalCenter : undefined
width: loader.width active: topBarContent.getWidgetVisible(model.widgetId)
height: loader.height sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
opacity: topBarContent.getWidgetEnabled(model.enabled) ? 1 : 0
asynchronous: true
Loader { onLoaded: {
id: loader if (item) {
anchors.verticalCenter: parent.verticalCenter item.onWidthChanged.connect(centerSection.updateLayout)
active: topBarContent.getWidgetVisible(parent.widgetId) if (model.widgetId === "spacer")
sourceComponent: topBarContent.getWidgetComponent(parent.widgetId) item.spacerSize = Qt.binding(() => {
opacity: topBarContent.getWidgetEnabled(parent.widgetData.enabled !== undefined ? parent.widgetData.enabled : true) ? 1 : 0 return model.size || 20
asynchronous: true })
onLoaded: {
if (item) {
item.onWidthChanged.connect(centerSection.updateLayout)
if (parent.widgetId === "spacer")
item.spacerSize = Qt.binding(() => {
return parent.spacerSize
})
Qt.callLater(centerSection.updateLayout)
}
}
onActiveChanged: {
Qt.callLater(centerSection.updateLayout) Qt.callLater(centerSection.updateLayout)
} }
} }
onActiveChanged: {
Qt.callLater(centerSection.updateLayout)
}
} }
} }
@@ -545,23 +530,16 @@ PanelWindow {
Repeater { Repeater {
model: SettingsData.topBarRightWidgetsModel model: SettingsData.topBarRightWidgetsModel
Item { Loader {
property string widgetId: model.widgetId property string widgetId: model.widgetId
property var widgetData: model property var widgetData: model
property int spacerSize: model.size || 20 property int spacerSize: model.size || 20
anchors.verticalCenter: parent ? parent.verticalCenter : undefined anchors.verticalCenter: parent ? parent.verticalCenter : undefined
width: loader.width active: topBarContent.getWidgetVisible(model.widgetId)
height: loader.height sourceComponent: topBarContent.getWidgetComponent(model.widgetId)
opacity: topBarContent.getWidgetEnabled(model.enabled) ? 1 : 0
Loader { asynchronous: true
id: loader
anchors.verticalCenter: parent.verticalCenter
active: topBarContent.getWidgetVisible(parent.widgetId)
sourceComponent: topBarContent.getWidgetComponent(parent.widgetId)
opacity: topBarContent.getWidgetEnabled(parent.widgetData.enabled !== undefined ? parent.widgetData.enabled : true) ? 1 : 0
asynchronous: true
}
} }
} }
} }