From 5eb54a1a9fcb25790fa7e54c4c20f61b39368e8b Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Tue, 28 May 2013 16:06:31 +0200
Subject: [PATCH] Fixed incorrect size hints for TableView
This ensures that double click to adjust content size on
headers doesn't end up eliding text. We also added
significantly more space by default.
Change-Id: I05a05649a41ef4b70ee839195a87c684786760b1
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
src/styles/Base/TableViewStyle.qml | 10 +++++-----
src/styles/Desktop/TableViewStyle.qml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/styles/Base/TableViewStyle.qml b/src/styles/Base/TableViewStyle.qml
index f44893f69..b53b3c649 100644
--- a/src/styles/Base/TableViewStyle.qml
+++ b/src/styles/Base/TableViewStyle.qml
@@ -75,8 +75,9 @@ ScrollViewStyle {
anchors.fill: parent
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft
- anchors.leftMargin: 4
+ anchors.leftMargin: 12
text: styleData.value
+ elide: Text.ElideRight
color: textColor
renderType: Text.NativeRendering
}
@@ -92,8 +93,7 @@ ScrollViewStyle {
/* Delegate for header. This delegate is described in \l TableView::rowDelegate */
property Component rowDelegate: Rectangle {
- implicitHeight: 20
- implicitWidth: 80
+ height: 20
property color selectedColor: styleData.hasActiveFocus ? "#38d" : "#999"
gradient: Gradient {
GradientStop { color: styleData.selected ? Qt.lighter(selectedColor, 1.3) : styleData.alternate ? "#f2f2f2" : "white" ; position: 0 }
@@ -115,13 +115,13 @@ ScrollViewStyle {
/* Delegate for header. This delegate is described in \l TableView::itemDelegate */
property Component itemDelegate: Item {
height: Math.max(16, label.implicitHeight)
- property int implicitWidth: sizehint.paintedWidth + 4
+ property int implicitWidth: sizehint.paintedWidth + 20
Text {
id: label
objectName: "label"
width: parent.width
- anchors.margins: 6
+ anchors.leftMargin: 12
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: styleData.textAlignment
diff --git a/src/styles/Desktop/TableViewStyle.qml b/src/styles/Desktop/TableViewStyle.qml
index c8eac3c62..9a3584d2c 100644
--- a/src/styles/Desktop/TableViewStyle.qml
+++ b/src/styles/Desktop/TableViewStyle.qml
@@ -86,13 +86,13 @@ ScrollViewStyle {
property Component itemDelegate: Item {
height: Math.max(16, label.implicitHeight)
- property int implicitWidth: sizehint.paintedWidth + 4
+ property int implicitWidth: sizehint.paintedWidth + 16
Text {
id: label
objectName: "label"
width: parent.width
- anchors.margins: 6
+ anchors.leftMargin: 8
font: __styleitem.font
anchors.left: parent.left
anchors.right: parent.right
--
GitLab