summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-06-05 15:21:32 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 16:06:02 +0200
commit0b4fa5ff684f36121491e1513ebc55dc4460605c (patch)
treeeeb98ecad3d271989f7c22c68d642f9503c5eb65
parentd3edc05b787ad9b079b36a2e509420fa715d66dc (diff)
downloadqtquickcontrols-0b4fa5ff684f36121491e1513ebc55dc4460605c.tar.gz
TableView: Make sure we get the content width with hidden header
The key is to get a headerRowDelegate of non-null dimensions. Task-number: QTBUG-39393 Change-Id: I5ceadb07ebfc84142bbbfe98c5d61780e0314cf5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r--src/controls/TableView.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index c9cbf452..de46469b 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -558,7 +558,7 @@ ScrollView {
id: listView
focus: true
activeFocusOnTab: root.activeFocusOnTab
- anchors.topMargin: tableHeader.height
+ anchors.topMargin: headerVisible ? tableHeader.height : 0
anchors.fill: parent
currentIndex: -1
visible: columnCount > 0
@@ -954,7 +954,7 @@ ScrollView {
width: columnCount === 1 ? viewport.width + __verticalScrollBar.width : modelData.width
implicitWidth: headerStyle.implicitWidth
visible: modelData.visible
- height: headerVisible ? headerStyle.height : 0
+ height: headerStyle.height
Loader {
id: headerStyle