Merge pull request #16406 from Rmys/master

plasma-workspace-6.3.4 rebuild
This commit is contained in:
Rmys
2025-04-16 11:28:30 +03:00
committed by GitHub
2 changed files with 44 additions and 3 deletions
@@ -0,0 +1,41 @@
From 47d502353720004fa2d0e7b0065994b75b3e0ded Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Wed, 2 Apr 2025 20:57:09 +0000
Subject: [PATCH] applets/notifications: improve paddings again
Zero top padding is fine when there's only a summary label, but looks
bad when there's body text, an icon, or both. Correct that.
(cherry picked from commit 53b6289f84094d91745b79c3bc902e7f80f235ef)
Co-authored-by: Nate Graham <nate@kde.org>
---
.../package/contents/ui/delegates/DelegatePopup.qml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
index 2038f49de50..e22a8322196 100644
--- a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
+++ b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
@@ -93,6 +93,8 @@ BaseDelegate {
Components.Summary {
id: summary
+ // Base layout intentionally has no row spacing, so add top padding here when needed
+ Layout.topMargin: delegateRoot.hasBodyText || icon.visible ? Kirigami.Units.smallSpacing : 0
Layout.fillWidth: true
Layout.row: 2
Layout.column: delegateRoot.__firstColumn
@@ -108,7 +110,7 @@ BaseDelegate {
Components.Icon {
id: icon
- // We removed the row spacing from the base layout, so re-add it just here
+ // Base layout intentionally has no row spacing, so add top padding here
Layout.topMargin: Kirigami.Units.smallSpacing
Layout.row: 2
Layout.column: delegateRoot.__firstColumn + 1
--
GitLab
@@ -142,7 +142,7 @@
<Patches>
<!--dirty fix for qt5.6.0 -->
<!-- <Patch level="1">plasma-animation-duration.patch</Patch> -->
<!-- <Patch level="1">d5a3e749.patch</Patch> -->
<Patch level="1">47d50235.patch</Patch>
</Patches>
</Source>
@@ -376,8 +376,8 @@
</Package>
<History>
<Update release="95">
<Date>2025-04-02</Date>
<Update release="96">
<Date>2025-04-16</Date>
<Version>6.3.4</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>