Merge branch 'develop' of github.com:papyros/qml-material into develop

papyros · Jan 31, 2015 · f79f489 · f79f489
2 parents 1e3fd29 + ffacc98
commit f79f489
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/modules/Material/Slider.qml b/modules/Material/Slider.qml
@@ -74,7 +74,7 @@ Controls.Slider {
                 Rectangle {
                     implicitHeight: parent.height / 2
                     implicitWidth: parent.width / 2
-                    color: Theme.primaryColor
+                    color: control.color
                     anchors.right: parent.right
                     anchors.bottom: parent.bottom
                     antialiasing: true

diff --git a/modules/Material/TextField.qml b/modules/Material/TextField.qml
@@ -94,6 +94,12 @@ FocusScope {
 
       onAccepted: field.accepted()
       onEditingFinished: field.editingFinished()
+
+      MouseArea {
+          anchors.fill: parent
+          cursorShape: Qt.IBeamCursor
+          acceptedButtons: Qt.NoButton
+      }
    }
 
    Label {

diff --git a/qml-materials.pro → qml-material.pro b/qml-materials.pro → qml-material.pro