1
=== modified file 'src/app/qml/PdfView.qml'
2
--- src/app/qml/PdfView.qml	2015-02-05 19:30:53 +0000
3
+++ src/app/qml/PdfView.qml	2015-02-09 12:10:55 +0000
4
@@ -37,25 +37,24 @@
5
37
    PDF.VerticalView {
37
    PDF.VerticalView {
6
38
        id: pdfView
38
        id: pdfView
7
39
        objectName: "pdfView"
39
        objectName: "pdfView"
8
40
9
41
        anchors.fill: parent
40
        anchors.fill: parent
10
42
        spacing: units.gu(2)
41
        spacing: units.gu(2)
11
43
42
12
44
        clip: true
43
        clip: true
13
45
        boundsBehavior: Flickable.StopAtBounds
44
        boundsBehavior: Flickable.StopAtBounds
14
46
15
47
        cacheBuffer: height * poppler.providersNumber * _zoomHelper.scale * 0.5
16
48
17
49
        flickDeceleration: 1500 * units.gridUnit / 8
45
        flickDeceleration: 1500 * units.gridUnit / 8
18
50
        maximumFlickVelocity: 2500 * units.gridUnit / 8
46
        maximumFlickVelocity: 2500 * units.gridUnit / 8
19
51
47
20
48
        contentWidth: parent.width * _zoomHelper.scale
21
49
        cacheBuffer: height * poppler.providersNumber * _zoomHelper.scale * 0.5
22
50
        interactive: !pinchy.pinch.active
23
51
24
52
        model: poppler
52
        model: poppler
25
53
        delegate: PdfViewDelegate {
53
        delegate: PdfViewDelegate {
26
54
            onWidthChanged: QQuickView.releaseResources()
27
55
            Component.onDestruction: QQuickView.releaseResources()
54
            Component.onDestruction: QQuickView.releaseResources()
28
56
        }
55
        }
29
57
56
31
58
        contentWidth: parent.width * _zoomHelper.scale
57
        // FIXME: On zooming, keep the same content position.
32
59
        PinchArea {
58
        PinchArea {
33
60
            id: pinchy
59
            id: pinchy
34
61
            anchors.fill: parent
60
            anchors.fill: parent
35
@@ -66,14 +65,13 @@
36
66
                maximumScale: 2.5
65
                maximumScale: 2.5
37
67
            }
66
            }
38
68
67
39
69
            onPinchStarted: pdfView.interactive = false;
40
70
41
71
            // FIXME: On zooming, keep the same content position.
42
72
            // onPinchUpdated: {}
43
73
44
74
            onPinchFinished: {
68
            onPinchFinished: {
45
75
                pdfView.interactive = true;
46
76
                pdfView.returnToBounds();
69
                pdfView.returnToBounds();
47
70
48
71
                // This is a bit expensive, so it's safer to put it here.
49
72
                // It won't be called on desktop (where PinchArea is not used),
50
73
                // but it's not a problem at the moment (our target is phone).
51
74
                QQuickView.releaseResources();
52
77
            }
75
            }
53
78
        }
76
        }
54
79
77
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-02-26
Alan Pope 🍺🐧🐱 🦄 (community)		2015-02-09	Approve on 2015-02-18
Review via email: mp+249060@code.launchpad.net