diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:18:05 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:34:23 +0200 |
| commit | ca73389c6a2afd7e88a9bd16333c27fc82fb5c61 (patch) | |
| tree | 994d5dbdc2be692baf233601c2f3916981987c97 /src/controls/Styles/Base | |
| parent | 8a13f087d3c0c7b9010b9861890b27a17889aeaa (diff) | |
| parent | ca56fb96dd2228404c3f51691bb78a9f2419f319 (diff) | |
| download | qtquickcontrols-ca73389c6a2afd7e88a9bd16333c27fc82fb5c61.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Icc15fe685e94dd043979b6b9c6a624f18f2d1e4c
Diffstat (limited to 'src/controls/Styles/Base')
| -rw-r--r-- | src/controls/Styles/Base/CalendarStyle.qml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index c8a373b6..bb1c6970 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -172,8 +172,8 @@ Style { */ property Component background: Rectangle { color: "#fff" - implicitWidth: 250 - implicitHeight: 250 + implicitWidth: Math.max(250, Math.round(TextSingleton.implicitHeight * 14)) + implicitHeight: Math.max(250, Math.round(TextSingleton.implicitHeight * 14)) } /*! @@ -189,7 +189,7 @@ Style { \endtable */ property Component navigationBar: Rectangle { - height: 41 + height: Math.round(TextSingleton.implicitHeight * 2.73) color: "#f9f9f9" Rectangle { @@ -218,7 +218,7 @@ Style { text: styleData.title elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter - font.pointSize: 14 + font.pixelSize: TextSingleton.implicitHeight * 1.25 anchors.verticalCenter: parent.verticalCenter anchors.left: previousMonth.right anchors.leftMargin: 2 @@ -319,7 +319,7 @@ Style { */ property Component dayOfWeekDelegate: Rectangle { color: gridVisible ? "#fcfcfc" : "transparent" - implicitHeight: 40 + implicitHeight: Math.round(TextSingleton.implicitHeight * 2.25) Label { text: control.__locale.dayName(styleData.dayOfWeek, control.dayOfWeekFormat) anchors.centerIn: parent @@ -340,7 +340,7 @@ Style { \endtable */ property Component weekNumberDelegate: Rectangle { - implicitWidth: 30 + implicitWidth: Math.round(TextSingleton.implicitHeight * 2) Label { text: styleData.weekNumber anchors.centerIn: parent |