diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 08:40:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-24 08:40:45 +0100 |
| commit | a5ea2f7e9928c651319f8133eeb0fcc9fe6df6fb (patch) | |
| tree | 761528101bd2df4dffdd6504ee24a1acabeba8d2 /src/widgets/itemviews/qlistview.cpp | |
| parent | 291b3cebb905c3924eefa1e5a7c6ac31ca89aacd (diff) | |
| parent | 875420f1c29f0d5e66b4dcacbe95d31dd5dca585 (diff) | |
| download | qtbase-a5ea2f7e9928c651319f8133eeb0fcc9fe6df6fb.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ibe5b4aa249863a54007180f3684dc5ce1b23cb7b
Diffstat (limited to 'src/widgets/itemviews/qlistview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qlistview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index ec01922746..4cb9214ff4 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -1728,8 +1728,11 @@ void QListViewPrivate::prepareItemsLayout() layoutBounds = QRect(QPoint(), q->maximumViewportSize()); int frameAroundContents = 0; - if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) - frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2; + if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) { + QStyleOption option; + option.initFrom(q); + frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &option) * 2; + } // maximumViewportSize() already takes scrollbar into account if policy is // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy |