Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-05 21:15:38 -05:00
Code Packages Releases Activity

Fix again widget positioning logic.

Browse Source 
- This is complicated because widgets unload, and we already want to
  respect positioning even when unloaded.
- Plus in center section we want odd number for the center one to always
  be centered, etc, etc.
This commit is contained in:
bbedward
2025-09-23 16:30:49 -04:00
parent 7a7d7d053a
commit e9a61a4f81
2 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/DankDash/Overview/UserInfoCard.qml
View File

@@ -144,7 +144,8 @@ Card {
property real availableWidth: parent.parent.parent.parent.width - avatarContainer.width - Theme.spacingM * 3 - 16 - Theme.spacingS
property real longTextWidth: {
const testMetrics = Qt.createQmlObject('import QtQuick; TextMetrics { font.pixelSize: ' + Theme.fontSizeSmall + ' }', uptimeText)
const fontSize = Math.round(Theme.fontSizeSmall || 12)
const testMetrics = Qt.createQmlObject('import QtQuick; TextMetrics { font.pixelSize: ' + fontSize + ' }', uptimeText)
testMetrics.text = UserInfoService.uptime || "up 1 hour, 23 minutes"
const result = testMetrics.width
testMetrics.destroy()

89
Modules/TopBar/TopBar.qml
View File

@@ -624,31 +624,80 @@ PanelWindow {
}
}
} else {
if (totalWidgets >= 2) {
const leftIndex = (totalWidgets / 2) - 1
const rightIndex = totalWidgets / 2
const halfSpacing = spacing / 2
let configuredLeftIndex = (configuredWidgets / 2) - 1
let configuredRightIndex = configuredWidgets / 2
const halfSpacing = spacing / 2
if (centerWidgets[leftIndex] && centerWidgets[rightIndex]) {
centerWidgets[leftIndex].x = parentCenterX - halfSpacing - centerWidgets[leftIndex].width
centerWidgets[rightIndex].x = parentCenterX + halfSpacing
let leftWidget = null
let rightWidget = null
let leftWidgets = []
let rightWidgets = []
let currentX = centerWidgets[leftIndex].x
for (var i = leftIndex - 1; i >= 0; i--) {
if (centerWidgets[i]) {
currentX -= (spacing + centerWidgets[i].width)
centerWidgets[i].x = currentX
let currentConfigIndex = 0
for (var i = 0; i < centerRepeater.count; i++) {
const item = centerRepeater.itemAt(i)
if (item && topBarContent.getWidgetVisible(item.widgetId)) {
if (item.active && item.item) {
if (currentConfigIndex < configuredLeftIndex) {
leftWidgets.push(item.item)
} else if (currentConfigIndex === configuredLeftIndex) {
leftWidget = item.item
} else if (currentConfigIndex === configuredRightIndex) {
rightWidget = item.item
} else {
rightWidgets.push(item.item)
}
}
currentConfigIndex++
}
}
currentX = centerWidgets[rightIndex].x + centerWidgets[rightIndex].width
for (var i = rightIndex + 1; i < totalWidgets; i++) {
if (centerWidgets[i]) {
currentX += spacing
centerWidgets[i].x = currentX
currentX += centerWidgets[i].width
}
}
if (leftWidget && rightWidget) {
leftWidget.x = parentCenterX - halfSpacing - leftWidget.width
rightWidget.x = parentCenterX + halfSpacing
let currentX = leftWidget.x
for (var i = leftWidgets.length - 1; i >= 0; i--) {
currentX -= (spacing + leftWidgets[i].width)
leftWidgets[i].x = currentX
}
currentX = rightWidget.x + rightWidget.width
for (var i = 0; i < rightWidgets.length; i++) {
currentX += spacing
rightWidgets[i].x = currentX
currentX += rightWidgets[i].width
}
} else if (leftWidget && !rightWidget) {
leftWidget.x = parentCenterX - halfSpacing - leftWidget.width
let currentX = leftWidget.x
for (var i = leftWidgets.length - 1; i >= 0; i--) {
currentX -= (spacing + leftWidgets[i].width)
leftWidgets[i].x = currentX
}
currentX = leftWidget.x + leftWidget.width + spacing
for (var i = 0; i < rightWidgets.length; i++) {
currentX += spacing
rightWidgets[i].x = currentX
currentX += rightWidgets[i].width
}
} else if (!leftWidget && rightWidget) {
rightWidget.x = parentCenterX + halfSpacing
let currentX = rightWidget.x - spacing
for (var i = leftWidgets.length - 1; i >= 0; i--) {
currentX -= leftWidgets[i].width
leftWidgets[i].x = currentX
currentX -= spacing
}
currentX = rightWidget.x + rightWidget.width
for (var i = 0; i < rightWidgets.length; i++) {
currentX += spacing
rightWidgets[i].x = currentX
currentX += rightWidgets[i].width
}
} else if (totalWidgets === 1 && centerWidgets[0]) {
centerWidgets[0].x = parentCenterX - (centerWidgets[0].width / 2)