Merge pull request #441 from lduboeuf/xenial_-_notification_truncation

YUMI-14 Notifications: allow more than 2 lines when hint "x-canonical-truncation" is set to false
ubports · Dec 13, 2022 · aded21a · aded21a
2 parents 2e8dad4 + 7ce9e6e
commit aded21a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,2 +1,6 @@
 @Library('ubports-build-tools') _
-buildAndProvideDebianPackage()
+buildAndProvideDebianPackage(
+    /* isArchIndependent */ false,
+    /* ignoredArchs */ [],
+    /* isHeavyPackage */ true
+)
diff --git a/qml/Notifications/Notification.qml b/qml/Notifications/Notification.qml
@@ -321,7 +321,15 @@ StyledItem {
                         font.weight: Font.Light
                         color: theme.palette.normal.backgroundTertiaryText
                         wrapMode: Text.Wrap
-                        maximumLineCount: type === Notification.SnapDecision ? 12 : 2
+                        maximumLineCount: {
+                            if (type === Notification.SnapDecision) {
+                                return 12;
+                            } else if (notification.hints["x-canonical-truncation"] === false) {
+                                return 20;
+                            } else {
+                                return 2;
+                            }
+                        }
                         elide: Text.ElideRight
                         textFormat: Text.PlainText
                         lineHeight: 1.1