lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Notification: fixed positionning.

Browse Source
This commit is contained in:
ItsLemmy
2025-11-07 16:56:15 -05:00
parent b180325691
commit b0ea80525a
1 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Notification/Notification.qml
+39 -23
View File
@@ -58,23 +58,38 @@ Variants {
readonly property bool isRight: location.endsWith("_right")
readonly property bool isCentered: location === "top" || location === "bottom"
readonly property string barPos: Settings.data.bar.position
readonly property bool isFloating: Settings.data.bar.floating
readonly property int notifWidth: Math.round(420 * Style.uiScaleRatio)
// Calculate bar offset once
readonly property int barOffset: {
const barPos = Settings.data.bar.position
const isFloating = Settings.data.bar.floating
// Calculate bar offsets for each edge separately
readonly property int barOffsetTop: {
if (barPos !== "top")
return 0
const floatMarginV = isFloating ? Settings.data.bar.marginVertical * Style.marginXL : 0
const floatMarginH = isFloating ? Settings.data.bar.marginHorizontal * Style.marginXL : 0
return Style.barHeight + floatMarginV
}
// Check if bar is on same edge as notifications
if ((isTop && barPos === "top") || (isBottom && barPos === "bottom")) {
return Style.barHeight + floatMarginV
}
if ((isLeft && barPos === "left") || (isRight && barPos === "right")) {
return Style.barHeight + floatMarginH
}
return 0
readonly property int barOffsetBottom: {
if (barPos !== "bottom")
return 0
const floatMarginV = isFloating ? Settings.data.bar.marginVertical * Style.marginXL : 0
return Style.barHeight + floatMarginV
}
readonly property int barOffsetLeft: {
if (barPos !== "left")
return 0
const floatMarginH = isFloating ? Settings.data.bar.marginHorizontal * Style.marginXL : 0
return floatMarginH
}
readonly property int barOffsetRight: {
if (barPos !== "right")
return 0
const floatMarginH = isFloating ? Settings.data.bar.marginHorizontal * Style.marginXL : 0
return floatMarginH
}
// Anchoring
@@ -83,11 +98,11 @@ Variants {
anchors.left: isLeft
anchors.right: isRight
// Margins for PanelWindow (not anchors.topMargin!)
margins.top: isTop ? Style.marginM + barOffset : 0
margins.bottom: isBottom ? Style.marginM + barOffset : 0
margins.left: isLeft ? Style.marginM + barOffset : 0
margins.right: isRight ? Style.marginM + barOffset : 0
// Margins for PanelWindow - only apply bar offset for the specific edge where the bar is
margins.top: isTop ? Style.marginM + barOffsetTop : 0
margins.bottom: isBottom ? Style.marginM + barOffsetBottom : 0
margins.left: isLeft ? Style.marginM + barOffsetLeft : 0
margins.right: isRight ? Style.marginM + barOffsetRight : 0
implicitWidth: notifWidth
implicitHeight: notificationStack.implicitHeight + Style.marginL
@@ -186,7 +201,6 @@ Variants {
id: cardBackground
anchors.fill: parent
anchors.margins: Style.marginM
anchors.rightMargin: Style.marginXL
radius: Style.radiusL
border.color: Qt.alpha(Color.mOutline, Settings.data.notifications.backgroundOpacity || 1.0)
border.width: Style.borderS
@@ -373,7 +387,6 @@ Variants {
id: notificationContent
anchors.fill: parent
anchors.margins: Style.marginM
anchors.rightMargin: Style.marginXL
spacing: Style.marginM
RowLayout {
@@ -433,10 +446,11 @@ Variants {
color: Color.mOnSurface
textFormat: Text.PlainText
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.fillWidth: true
maximumLineCount: 3
elide: Text.ElideRight
visible: text.length > 0
Layout.fillWidth: true
Layout.rightMargin: Style.marginM
}
NText {
@@ -445,10 +459,12 @@ Variants {
color: Color.mOnSurface
textFormat: Text.PlainText
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.fillWidth: true
maximumLineCount: 5
elide: Text.ElideRight
visible: text.length > 0
Layout.fillWidth: true
Layout.rightMargin: Style.marginXL
}
// Actions
@@ -508,7 +524,7 @@ Variants {
anchors.top: parent.top
anchors.topMargin: Style.marginXL
anchors.right: parent.right
anchors.rightMargin: Style.marginXL * 1.5
anchors.rightMargin: Style.marginXL
onClicked: {
NotificationService.removeFromHistory(model.id)