diff --git a/examples/content/Styles.qml b/examples/content/Styles.qml index 87e1661623177e164c77c00adac92fa93e66e35c..d28b560afbc4bda35ceb8e2070b3c4cc909e1c98 100644 --- a/examples/content/Styles.qml +++ b/examples/content/Styles.qml @@ -150,9 +150,9 @@ Item { } property Component textfieldStyle: TextFieldStyle { + implicitWidth: 100 + implicitHeight: 20 background: Rectangle { - width: 100 - height: 20 color: "#f0f0f0" antialiasing: true border.color: "gray" diff --git a/src/qtdesktop/TextField.qml b/src/qtdesktop/TextField.qml index f02f50f12208bcae6a40dd7a302bdd9e70a5f907..7005c7b93ab1a045cbbbdec8780d39ab0f3bdaec 100644 --- a/src/qtdesktop/TextField.qml +++ b/src/qtdesktop/TextField.qml @@ -40,6 +40,7 @@ import QtQuick 2.0 import QtDesktop 1.0 +import "Styles" import "Styles/Settings.js" as Settings FocusScope { diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml index a148a0fd81ca0ce3e87ca518ebcfc6bc4b9fe50d..da4bb45472f58d6d4202b1622768907dc30f8312 100644 --- a/src/styles/TextFieldStyle.qml +++ b/src/styles/TextFieldStyle.qml @@ -44,8 +44,8 @@ Item { id: style anchors.fill: parent - implicitWidth: 100 - implicitHeight: backgroundLoader.item.implicitHeight + implicitWidth: backgroundLoader.implicitWidth ? backgroundLoader.implicitWidth : 100 + implicitHeight: backgroundLoader.implicitHeight ? backgroundLoader.implicitHeight : 20 property int topMargin: 4 property int leftMargin: 8 @@ -67,8 +67,6 @@ Item { property Component background: Rectangle { id: styleitem - anchors.fill: parent - implicitHeight: 20 border.color: Qt.darker(backgroundColor, 2) gradient: Gradient { GradientStop{color: Qt.darker(backgroundColor, 1.1) ; position: 0}