[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime/KDE/4.9] plasma/declarativeimports/plasmacomponents/qml: Revert "Fix padding to the
From:       T.C. Hollingsworth <tchollingsworth () gmail ! com>
Date:       2012-10-12 2:26:48
Message-ID: 20121012022648.83D1CA6075 () git ! kde ! org
[Download RAW message or body]

Git commit 0f4ea436900c560c99ba947dcda9684f080385ad by T.C. Hollingsworth.
Committed on 12/10/2012 at 04:23.
Pushed by hollingsworth into branch 'KDE/4.9'.

Revert "Fix padding to the left and right of text in a textField"

This reverts commit 9e5a50dcd69bf4844af6ecca9555f5b1db67121e.

Accidentally cherry-picked by a script fixing up documentation.

M  +6    -7    plasma/declarativeimports/plasmacomponents/qml/TextField.qml

http://commits.kde.org/kde-runtime/0f4ea436900c560c99ba947dcda9684f080385ad

diff --git a/plasma/declarativeimports/plasmacomponents/qml/TextField.qml \
b/plasma/declarativeimports/plasmacomponents/qml/TextField.qml index be54695..201b61b \
                100644
--- a/plasma/declarativeimports/plasmacomponents/qml/TextField.qml
+++ b/plasma/declarativeimports/plasmacomponents/qml/TextField.qml
@@ -228,8 +228,8 @@ FocusScope {
     property alias activeFocus: textInput.activeFocus
 
     // TODO: fix default size
-    implicitWidth: theme.defaultFont.mSize.width*12 + base.internalPadding*2
-    implicitHeight: theme.defaultFont.mSize.height + base.internalPadding*2
+    implicitWidth: theme.defaultFont.mSize.width*12
+    implicitHeight: theme.defaultFont.mSize.height*1.6
     // TODO: needs to define if there will be specific graphics for
     //     disabled text fields
     opacity: enabled ? 1.0 : 0.5
@@ -247,7 +247,6 @@ FocusScope {
         anchors.fill: parent
         imagePath: "widgets/lineedit"
         prefix: "base"
-        property real internalPadding: theme.defaultFont.mSize.height*0.3
     }
 
     MouseArea {
@@ -267,8 +266,8 @@ FocusScope {
             left: parent.left
             right: parent.right
             verticalCenter: parent.verticalCenter
-            leftMargin: base.margins.left + base.internalPadding
-            rightMargin: base.margins.right + base.internalPadding
+            leftMargin: 2 * base.margins.left
+            rightMargin: 2 * base.margins.right
         }
         text: placeholderText
         visible: textInput.text == "" && !textField.activeFocus
@@ -296,8 +295,8 @@ FocusScope {
             right: parent.right
             verticalCenter: parent.verticalCenter
             // TODO: see what is the correct policy for margins
-            leftMargin: base.margins.left + base.internalPadding
-            rightMargin: base.margins.right + (clearButton.opacity > 0 ? \
clearButton.width : 0)  + base.internalPadding +            leftMargin: 2 * \
base.margins.left +            rightMargin: 2 * base.margins.right + \
(clearButton.opacity > 0 ? clearButton.width : 0)  }
         passwordCharacter: "•"
         selectByMouse: true


[prev in list] [next in list] [prev in thread] [next in thread]