From f9d7fc87d5646b6b8503cbf759f7c7ed086b157e Mon Sep 17 00:00:00 2001 From: Martin Klapetek <mklapetek@kde.org> Date: Mon, 16 Nov 2015 11:52:55 -0500 Subject: [PATCH] [calendar] Fix binding loops --- src/declarativeimports/calendar/qml/DayDelegate.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/declarativeimports/calendar/qml/DayDelegate.qml b/src/declarativeimports/calendar/qml/DayDelegate.qml index fbf875b88..4591bcad7 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 }