diff options
Diffstat (limited to 'src/imports/controls/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index d9f31b2f..fc07e7bb 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,18 +35,20 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T T.TextField { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - placeholder.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, + placeholderText ? placeholder.implicitWidth + leftPadding + rightPadding : 0) + || contentWidth + leftPadding + rightPadding + implicitHeight: Math.max(contentHeight + topPadding + bottomPadding, + background ? background.implicitHeight : 0, placeholder.implicitHeight + topPadding + bottomPadding) padding: 6 - leftPadding: 10 + leftPadding: padding + 4 opacity: enabled ? 1 : 0.2 color: "#353637" @@ -66,17 +68,15 @@ T.TextField { color: "#bdbebf" horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment - visible: !control.displayText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) + visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight } - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 40 -// border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? "transparent" : "#353637" - border.color: control.enabled ? "#bdbebf" : "transparent" + border.width: control.activeFocus ? 2 : 1 + color: control.enabled ? "#ffffff" : "#353637" + border.color: control.activeFocus ? "#0066ff" : (control.enabled ? "#bdbebf" : "transparent") } - //! [background] } |