Commit 414fb2e2 authored by Jens Bache-Wiig's avatar Jens Bache-Wiig Committed by The Qt Project
Browse files

Fix default size on TextField


Change-Id: I2fc831bb9b2ca4b39ca489c2b8fcd028fae7b043
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent fbafa183
6.2 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 dev old/5.1 old/5.2 wip/calendar wip/tizen v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1
No related merge requests found
Showing with 5 additions and 6 deletions
...@@ -150,9 +150,9 @@ Item { ...@@ -150,9 +150,9 @@ Item {
} }
property Component textfieldStyle: TextFieldStyle { property Component textfieldStyle: TextFieldStyle {
implicitWidth: 100
implicitHeight: 20
background: Rectangle { background: Rectangle {
width: 100
height: 20
color: "#f0f0f0" color: "#f0f0f0"
antialiasing: true antialiasing: true
border.color: "gray" border.color: "gray"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtDesktop 1.0 import QtDesktop 1.0
import "Styles"
import "Styles/Settings.js" as Settings import "Styles/Settings.js" as Settings
FocusScope { FocusScope {
......
...@@ -44,8 +44,8 @@ Item { ...@@ -44,8 +44,8 @@ Item {
id: style id: style
anchors.fill: parent anchors.fill: parent
implicitWidth: 100 implicitWidth: backgroundLoader.implicitWidth ? backgroundLoader.implicitWidth : 100
implicitHeight: backgroundLoader.item.implicitHeight implicitHeight: backgroundLoader.implicitHeight ? backgroundLoader.implicitHeight : 20
property int topMargin: 4 property int topMargin: 4
property int leftMargin: 8 property int leftMargin: 8
...@@ -67,8 +67,6 @@ Item { ...@@ -67,8 +67,6 @@ Item {
property Component background: Rectangle { property Component background: Rectangle {
id: styleitem id: styleitem
anchors.fill: parent
implicitHeight: 20
border.color: Qt.darker(backgroundColor, 2) border.color: Qt.darker(backgroundColor, 2)
gradient: Gradient { gradient: Gradient {
GradientStop{color: Qt.darker(backgroundColor, 1.1) ; position: 0} GradientStop{color: Qt.darker(backgroundColor, 1.1) ; position: 0}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment