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

List:       kde-commits
Subject:    [plasma-framework] src/declarativeimports/calendar/qml: [calendar] Fix binding loops
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2015-11-16 16:55:21
Message-ID: E1ZyN3p-0006OB-OL () scm ! kde ! org
[Download RAW message or body]

Git commit f9d7fc87d5646b6b8503cbf759f7c7ed086b157e by Martin Klapetek.
Committed on 16/11/2015 at 16:52.
Pushed by mklapetek into branch 'master'.

[calendar] Fix binding loops

M  +5    -1    src/declarativeimports/calendar/qml/DayDelegate.qml

http://commits.kde.org/plasma-framework/f9d7fc87d5646b6b8503cbf759f7c7ed086=
b157e

diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/decl=
arativeimports/calendar/qml/DayDelegate.qml
index fbf875b..4591bca 100644
--- a/src/declarativeimports/calendar/qml/DayDelegate.qml
+++ b/src/declarativeimports/calendar/qml/DayDelegate.qml
@@ -103,13 +103,17 @@ MouseArea {
 =

     Components.Label {
         id: label
-        anchors.fill: parent
+        anchors.fill: todayRect
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         text: model.label || dayNumber
         opacity: isCurrent ? 1.0 : 0.5
         wrapMode: Text.NoWrap
         elide: Text.ElideRight
+        font.pixelSize: Math.max(theme.smallestFont.pixelSize, Math.floor(=
daysCalendar.cellHeight / 3))
+        // This is to avoid the "Both point size and
+        // pixel size set. Using pixel size" warnings
+        font.pointSize: undefined
         color: today ? theme.backgroundColor : theme.textColor
         Behavior on color {
             ColorAnimation { duration: units.shortDuration * 2 }
[prev in list] [next in list] [prev in thread] [next in thread]