Merge branch 'master' of git://anongit.kde.org/plasma-framework
This commit is contained in:
commit
77e0a58a60
@ -124,9 +124,10 @@ MouseArea {
|
|||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
fontSizeMode: Text.HorizontalFit
|
fontSizeMode: Text.HorizontalFit
|
||||||
font.pixelSize: Math.max(theme.smallestFont.pixelSize, Math.floor(daysCalendar.cellHeight / 3))
|
font.pixelSize: Math.max(theme.smallestFont.pixelSize, Math.floor(daysCalendar.cellHeight / 3))
|
||||||
// This is to avoid the "Both point size and
|
// Plasma component set point size, this code wants to set pixel size
|
||||||
// pixel size set. Using pixel size" warnings
|
// Setting both results in a warning
|
||||||
font.pointSize: undefined
|
// -1 is an undocumented same as unset (see qquickvaluetypes)
|
||||||
|
font.pointSize: -1
|
||||||
color: today ? theme.backgroundColor : theme.textColor
|
color: today ? theme.backgroundColor : theme.textColor
|
||||||
Behavior on color {
|
Behavior on color {
|
||||||
ColorAnimation { duration: units.shortDuration * 2 }
|
ColorAnimation { duration: units.shortDuration * 2 }
|
||||||
|
Loading…
Reference in New Issue
Block a user