diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-28 14:13:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-28 14:13:30 +0100 |
| commit | 35cca2149183db49ad1ca5972f66474c6f36dbe1 (patch) | |
| tree | 88c2bdd71323b0e0bb2c9c207802b5f36a8d0f64 /src/controls/Private/BasicTableView.qml | |
| parent | 4e26a18ede1775ae06bef7c272994e84510ebd9a (diff) | |
| parent | 84b48cadc8f68d57d1a750e6aec690f46582e0c5 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I753e8b4d10714f2b8c3cf0fccfed4dc312adbd9b
Diffstat (limited to 'src/controls/Private/BasicTableView.qml')
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 4ec322648..66ad0d365 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -474,8 +474,8 @@ ScrollView { property bool pressed: false } } - property int rowHeight: rowSizeItem.implicitHeight - property int paddedRowCount: height/rowHeight + property int rowHeight: Math.floor(rowSizeItem.implicitHeight) + property int paddedRowCount: rowHeight != 0 ? height/rowHeight : 0 y: listView.contentHeight - listView.contentY + listView.originY width: parent.width |