[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace/Plasma/5.9] applets/digital-clock/package/contents/ui: [Digital Clock] Take into
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2017-01-31 15:30:26
Message-ID: E1cYaO2-0003mC-Ta () code ! kde ! org
[Download RAW message or body]

Git commit 518a55d4fa7e0138eb39c3aa98c709c469c8949a by Kai Uwe Broulik.
Committed on 31/01/2017 at 15:29.
Pushed by broulik into branch 'Plasma/5.9'.

[Digital Clock] Take into account timezone label width for applet size

When time zone city name is wider than the clock, it would flow outside bou=
nds.

Differential Revision: https://phabricator.kde.org/D4371

M  +1    -1    applets/digital-clock/package/contents/ui/DigitalClock.qml

https://commits.kde.org/plasma-workspace/518a55d4fa7e0138eb39c3aa98c709c469=
c8949a

diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/a=
pplets/digital-clock/package/contents/ui/DigitalClock.qml
index e1bf1f7e..713235a9 100644
--- a/applets/digital-clock/package/contents/ui/DigitalClock.qml
+++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml
@@ -103,7 +103,7 @@ Item {
                 target: contentItem
 =

                 height: timeLabel.height + (main.showDate || timezoneLabel=
.visible ? 0.8 * timeLabel.height : 0)
-                width: Math.max(labelsGrid.width, dateLabel.paintedWidth)
+                width: Math.max(labelsGrid.width, timezoneLabel.paintedWid=
th, dateLabel.paintedWidth)
             }
 =

             PropertyChanges {
[prev in list] [next in list] [prev in thread] [next in thread]