diff options
| author | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2011-10-23 19:57:27 +0200 |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2011-11-21 15:19:50 +0100 |
| commit | b6f7b738d80869affab6810eb053d80c746cf3f5 (patch) | |
| tree | 2d434327de7b1c93864c143e1cec79aa472a9810 | |
| parent | ad2dc6fea3469386c0cc002bc0a686f71707c878 (diff) | |
| download | qtquickcontrols-b6f7b738d80869affab6810eb053d80c746cf3f5.tar.gz | |
- Don't allways fill background of tableview rows
- Fixed rounded look of TextField
| -rw-r--r-- | components/TableView.qml | 2 | ||||
| -rw-r--r-- | components/TextField.qml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/components/TableView.qml b/components/TableView.qml index b09f37df..3f8a81cb 100644 --- a/components/TableView.qml +++ b/components/TableView.qml @@ -336,7 +336,7 @@ FocusScope{ Loader { id: rowstyle // row delegate - sourceComponent: root.rowDelegate + sourceComponent: itemAlternateBackground || itemSelected ? root.rowDelegate : null // Row fills the tree width regardless of item size // But scrollbar should not adjust to it width: frameitem.width diff --git a/components/TextField.qml b/components/TextField.qml index 628036bf..bd7ea3cd 100644 --- a/components/TextField.qml +++ b/components/TextField.qml @@ -8,8 +8,8 @@ Components.TextField { placeholderText: "" topMargin: 2 bottomMargin: 2 - leftMargin: 6 - rightMargin: 6 + leftMargin: 8 + rightMargin: 8 implicitWidth: backgroundItem.implicitWidth implicitHeight: backgroundItem.implicitHeight @@ -29,11 +29,11 @@ Components.TextField { contentHeight: 25 } - Item{ + Item { id: focusFrame anchors.fill: textfield parent: textfield - visible: framestyle.styleHint("focuswidget") + visible: framestyle.styleHint("focuswidget") && styleHint !== "rounded" StyleItem { id: framestyle anchors.margins: -2 |