From 7a61a2be9b348bff67e2d6eb478986fe8a9b0cf7 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Fri, 1 Feb 2013 17:44:44 +0100
Subject: [PATCH] Fix regression in scrollbar spacing
Change-Id: I330ed019ae341915f8413318fb65d41cf24824d7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
src/qtdesktop/ScrollArea.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qtdesktop/ScrollArea.qml b/src/qtdesktop/ScrollArea.qml
index a6d8dce55..acdbfc655 100644
--- a/src/qtdesktop/ScrollArea.qml
+++ b/src/qtdesktop/ScrollArea.qml
@@ -233,7 +233,7 @@ FocusScope {
anchors.fill: parent
property int frameWidth: frame ? styleitem.pixelMetric("defaultframewidth") : 0
property bool outerFrame: !frame || !styleitem.styleHint("frameOnlyAroundContents")
- property int scrollBarSpacing: styleitem.pixelMetric("scrollbarspacing")
+ property int scrollBarSpacing: outerFrame ? 0 : styleitem.pixelMetric("scrollbarspacing")
property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ?
verticalScrollBar.width + scrollBarSpacing : 0
property int horizontalScrollbarOffset: horizontalScrollBar.visible && !horizontalScrollBar.isTransient ?
--
GitLab