diff options
| author | Frank Reininghaus <[email protected]> | 2013-11-18 23:44:45 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-11-18 23:44:45 +0100 |
| commit | d0b98ba085a41cea0157841576b37d2b74c5cff5 (patch) | |
| tree | 86e465a5e969af2b2ede5a3ea273639164de4dde /src | |
| parent | ac8722dc7d1a6b2f7669b270d65c3ed834582d7e (diff) | |
| parent | c89cd8e789743fbf437ea1971067511c6c57756d (diff) | |
Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/kitemlistcontainer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index f2e94b733..cd2fca1e1 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -338,16 +338,17 @@ void KItemListContainer::updateGeometries() int extra = frameWidth() * 2; QStyleOption option; option.initFrom(this); + int scrollbarSpacing = 0; if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, &option, this)) { - extra += style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this); + scrollbarSpacing = style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this); } const int widthDec = verticalScrollBar()->isVisible() - ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) + ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra; const int heightDec = horizontalScrollBar()->isVisible() - ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) + ? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) : extra; rect.adjust(0, 0, -widthDec, -heightDec); |