From 414fb2e25d0d273c270410ccf67c79bca626a5f9 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Thu, 6 Dec 2012 13:18:05 -0800
Subject: [PATCH] Fix default size on TextField
Change-Id: I2fc831bb9b2ca4b39ca489c2b8fcd028fae7b043
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
examples/content/Styles.qml | 4 ++--
src/qtdesktop/TextField.qml | 1 +
src/styles/TextFieldStyle.qml | 6 ++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/examples/content/Styles.qml b/examples/content/Styles.qml
index 87e166162..d28b560af 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 f02f50f12..7005c7b93 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 a148a0fd8..da4bb4547 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}
--
GitLab