From 6fe6e884d1b4133e92e35dc34fb3db71e1c5d6b7 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 13 May 2016 16:17:26 +0200 Subject: [PATCH] make sure horiz scrollbar is off when not needed size the page correctly to not have the horizontal scrollbar when not needed, and make sure the flickable is not interactive, as flicking is managed by hand with a mousearea --- mobile/components/DocumentView.qml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mobile/components/DocumentView.qml b/mobile/components/DocumentView.qml index 4efbadde0..5cc20863b 100644 --- a/mobile/components/DocumentView.qml +++ b/mobile/components/DocumentView.qml @@ -33,15 +33,17 @@ QtControls.ScrollView { property DocumentItem document property PageItem page: mouseArea.currPageDelegate.pageItem signal clicked - - onWidthChanged: resizeTimer.restart() - onHeightChanged: resizeTimer.restart() + + //NOTE: on some themes it tries to set the flickable to interactive + //but we need it always non interactive as we need to manage + //dragging by ourselves + Component.onCompleted: flick.interactive = false Flickable { id: flick - anchors.fill: parent + interactive: false + onWidthChanged: resizeTimer.restart() + onHeightChanged: resizeTimer.restart() - clip: true - Component.onCompleted: { flick.contentWidth = flick.width flick.contentHeight = flick.width / mouseArea.currPageDelegate.pageRatio @@ -248,4 +250,4 @@ QtControls.ScrollView { } } } -} \ No newline at end of file +}