1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 13:35:36 -05:00

account for topbar spacing on all popouts

This commit is contained in:
bbedward
2025-08-17 14:43:12 -04:00
parent fc15397a1e
commit 49c642a7fc
8 changed files with 10 additions and 10 deletions

View File

@@ -15,7 +15,7 @@ PanelWindow {
property bool isVisible: false property bool isVisible: false
property real triggerX: Theme.spacingL property real triggerX: Theme.spacingL
property real triggerY: Theme.barHeight + Theme.spacingXS property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
property real triggerWidth: 40 property real triggerWidth: 40
property string triggerSection: "left" property string triggerSection: "left"
property var triggerScreen: null property var triggerScreen: null

View File

@@ -15,7 +15,7 @@ PanelWindow {
readonly property bool hasActiveMedia: MprisController.activePlayer !== null readonly property bool hasActiveMedia: MprisController.activePlayer !== null
property bool calendarVisible: false property bool calendarVisible: false
property real triggerX: (Screen.width - 480) / 2 property real triggerX: (Screen.width - 480) / 2
property real triggerY: Theme.barHeight + 4 property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + 4
property real triggerWidth: 80 property real triggerWidth: 80
property string triggerSection: "center" property string triggerSection: "center"
property var triggerScreen: null property var triggerScreen: null

View File

@@ -19,7 +19,7 @@ PanelWindow {
property bool powerOptionsExpanded: false property bool powerOptionsExpanded: false
property var triggerScreen: null property var triggerScreen: null
property real triggerX: Screen.width - 600 - Theme.spacingL property real triggerX: Screen.width - 600 - Theme.spacingL
property real triggerY: Theme.barHeight + Theme.spacingXS property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
property real triggerWidth: 80 property real triggerWidth: 80
property string triggerSection: "right" property string triggerSection: "right"
@@ -71,7 +71,7 @@ PanelWindow {
active: controlCenterVisible active: controlCenterVisible
width: targetWidth width: targetWidth
height: root.powerOptionsExpanded ? 570 : 500 height: root.powerOptionsExpanded ? 570 : 500
y: Theme.barHeight + Theme.spacingXS y: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
x: { x: {
var centerX = root.triggerX + (root.triggerWidth / 2) - (targetWidth / 2) var centerX = root.triggerX + (root.triggerWidth / 2) - (targetWidth / 2)

View File

@@ -14,7 +14,7 @@ PanelWindow {
property bool notificationHistoryVisible: false property bool notificationHistoryVisible: false
property real triggerX: Screen.width - 400 - Theme.spacingL property real triggerX: Screen.width - 400 - Theme.spacingL
property real triggerY: Theme.barHeight + Theme.spacingXS property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
property real triggerWidth: 40 property real triggerWidth: 40
property string triggerSection: "right" property string triggerSection: "right"

View File

@@ -73,7 +73,7 @@ PanelWindow {
color: "transparent" color: "transparent"
implicitWidth: 400 implicitWidth: 400
implicitHeight: 122 implicitHeight: 122
onScreenYChanged: margins.top = Theme.barHeight + 4 + screenY onScreenYChanged: margins.top = Theme.barHeight - 4 + SettingsData.topBarSpacing + 4 + screenY
onHasValidDataChanged: { onHasValidDataChanged: {
if (!hasValidData && !exiting && !_isDestroying) { if (!hasValidData && !exiting && !_isDestroying) {
@@ -116,7 +116,7 @@ PanelWindow {
} }
margins { margins {
top: Theme.barHeight + 4 top: Theme.barHeight - 4 + SettingsData.topBarSpacing + 4
right: 12 right: 12
} }

View File

@@ -17,7 +17,7 @@ PanelWindow {
property bool isVisible: false property bool isVisible: false
property var parentWidget: null property var parentWidget: null
property real triggerX: Screen.width - 600 - Theme.spacingL property real triggerX: Screen.width - 600 - Theme.spacingL
property real triggerY: Theme.barHeight + Theme.spacingXS property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingXS
property real triggerWidth: 55 property real triggerWidth: 55
property string triggerSection: "right" property string triggerSection: "right"
property var triggerScreen: null property var triggerScreen: null

View File

@@ -42,7 +42,7 @@ PanelWindow {
width: ToastService.hasDetails ? 380 : messageText.implicitWidth + Theme.iconSize + Theme.spacingM * 3 + Theme.spacingL * 2 width: ToastService.hasDetails ? 380 : messageText.implicitWidth + Theme.iconSize + Theme.spacingM * 3 + Theme.spacingL * 2
height: toastContent.height + Theme.spacingL * 2 height: toastContent.height + Theme.spacingL * 2
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: Theme.barHeight + 2 y: Theme.barHeight - 4 + SettingsData.topBarSpacing + 2
color: { color: {
switch (ToastService.currentLevel) { switch (ToastService.currentLevel) {
case ToastService.levelError: case ToastService.levelError:

View File

@@ -13,7 +13,7 @@ PanelWindow {
property bool batteryPopupVisible: false property bool batteryPopupVisible: false
property real triggerX: Screen.width - 380 - Theme.spacingL property real triggerX: Screen.width - 380 - Theme.spacingL
property real triggerY: Theme.barHeight + Theme.spacingS property real triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingS
property real triggerWidth: 70 property real triggerWidth: 70
property string triggerSection: "right" property string triggerSection: "right"
property var triggerScreen: null property var triggerScreen: null