Skip to content

Commit f79f489

Browse files
committed
Merge branch 'develop' of github.com:papyros/qml-material into develop
2 parents 1e3fd29 + ffacc98 commit f79f489

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

modules/Material/Slider.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Controls.Slider {
7474
Rectangle {
7575
implicitHeight: parent.height / 2
7676
implicitWidth: parent.width / 2
77-
color: Theme.primaryColor
77+
color: control.color
7878
anchors.right: parent.right
7979
anchors.bottom: parent.bottom
8080
antialiasing: true

modules/Material/TextField.qml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ FocusScope {
9494

9595
onAccepted: field.accepted()
9696
onEditingFinished: field.editingFinished()
97+
98+
MouseArea {
99+
anchors.fill: parent
100+
cursorShape: Qt.IBeamCursor
101+
acceptedButtons: Qt.NoButton
102+
}
97103
}
98104

99105
Label {
File renamed without changes.

0 commit comments

Comments
 (0)