summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2014-03-17 03:39:29 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-17 17:19:20 +0100
commit337d611886cd4930febf02142f91a6ef3d2d0c61 (patch)
tree3b199e3117346493f5677975817d81f1f84f6268
parent1097eede1736df4f49be1b40ecfb5a4902f6e582 (diff)
downloadqtquickcontrols-337d611886cd4930febf02142f91a6ef3d2d0c61.tar.gz
Clean-up styling improvements for Calendar
This is a fix-up for 4569ed127c290bea8d165e15dc2eca525825c627 : "verticalAlignment: Text.AlignVCenter" not needed for alread-centered text; make previousMonth button center-in parent, similarly to nextMonth button; drop dead code from HoverButton. Change-Id: Iceb096944d084ecded70611e3da754150a0e098e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/Private/HoverButton.qml2
-rw-r--r--src/controls/Styles/Base/CalendarStyle.qml6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/controls/Private/HoverButton.qml b/src/controls/Private/HoverButton.qml
index 9d3ca713..1b79e087 100644
--- a/src/controls/Private/HoverButton.qml
+++ b/src/controls/Private/HoverButton.qml
@@ -65,8 +65,6 @@ Item {
width: implicitWidth/2
height: implicitHeight/2
anchors.centerIn: parent
- anchors.alignWhenCentered: true
- source: "images/leftanglearrow.png"
opacity: 0.6
}
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml
index 78a0eb9f..34f6eb05 100644
--- a/src/controls/Styles/Base/CalendarStyle.qml
+++ b/src/controls/Styles/Base/CalendarStyle.qml
@@ -190,9 +190,10 @@ Style {
}
HoverButton {
id: previousMonth
- anchors.left: parent.left
width: parent.height
- height: parent.height
+ height: width
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
source: "images/leftanglearrow.png"
onClicked: control.showPreviousMonth()
}
@@ -201,7 +202,6 @@ Style {
text: styleData.title
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
font.pointSize: 14
anchors.verticalCenter: parent.verticalCenter
anchors.left: previousMonth.right