diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:48 +0200 |
| commit | 63d832bcae98104bf071096605fc27a59a52254c (patch) | |
| tree | ba2fd42487c5889aad0b80aaddb0f304a690b561 /src/controls/Styles/Base | |
| parent | 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff) | |
| parent | a21a33fe79e82a7bd3471612b46106ac1343648f (diff) | |
| download | qtquickcontrols-63d832bcae98104bf071096605fc27a59a52254c.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
Diffstat (limited to 'src/controls/Styles/Base')
| -rw-r--r-- | src/controls/Styles/Base/ScrollViewStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 1a626423..09bc7da3 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -378,8 +378,8 @@ Style { width: __styleData.horizontal ? extent : implicitWidth anchors.top: bg.top anchors.left: bg.left - anchors.topMargin: __styleData.horizontal ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) - anchors.leftMargin: __styleData.horizontal ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 + anchors.topMargin: __styleData.horizontal || range === 0 ? 0 : -handleOverlap + (2 * begin * (bg.height + (2 * handleOverlap) - extent) + range) / (2 * range) + anchors.leftMargin: __styleData.horizontal && range !== 0 ? -handleOverlap + (2 * begin * (bg.width + (2 * handleOverlap) - extent) + range) / (2 * range) : 0 sourceComponent: handle property QtObject styleData: QtObject { readonly property bool hovered: activeControl === "handle" |