From 6d2ef8e25612d0c125190983bfed90bec106ec00 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Fri, 16 Oct 2020 12:38:45 +0000 Subject: [PATCH] [notifications] Fix margins of close button timeout indicator The previous calculation multiplied the DPR by `units.smallSpacing`, which was not correct; we wanted DPR added to the existing margin, not multiplied by it. Also using Math.floor is safer since Math.round sometimes rounds up (e.g. in case DPR is 2.501) which can cause undesirable effects. BUG: 425911 (cherry picked from commit 07992bc4abd6e9a3c4d1397eb051dfba50715010) --- .../notifications/package/contents/ui/NotificationHeader.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applets/notifications/package/contents/ui/NotificationHeader.qml b/applets/notifications/package/contents/ui/NotificationHeader.qml index ad635f80e..7a196ac26 100644 --- a/applets/notifications/package/contents/ui/NotificationHeader.qml +++ b/applets/notifications/package/contents/ui/NotificationHeader.qml @@ -225,7 +225,7 @@ RowLayout { Charts.PieChart { id: chart anchors.fill: parent - anchors.margins: Math.round(units.devicePixelRatio * units.smallSpacing) + anchors.margins: units.smallSpacing + Math.floor(units.devicePixelRatio) opacity: (notificationHeading.remainingTime > 0 && notificationHeading.remainingTime < notificationHeading.timeout) ? 1 : 0 Behavior on opacity { @@ -237,7 +237,7 @@ RowLayout { valueSources: Charts.SingleValueSource { value: notificationHeading.remainingTime } colorSource: Charts.SingleValueSource { value: theme.highlightColor } - thickness: Math.round(units.devicePixelRatio) * 5 + thickness: Math.floor(units.devicePixelRatio) * 5 transform: Scale { origin.x: chart.width / 2; xScale: -1 } }