1
=== modified file 'qml/Stage/ChildWindow.qml'
2
--- qml/Stage/ChildWindow.qml	2017-01-26 11:10:01 +0000
3
+++ qml/Stage/ChildWindow.qml	2017-02-22 15:15:37 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright (C) 2016 Canonical, Ltd.
2
 * Copyright (C) 2016-2017 Canonical, Ltd.
8
3
 *
3
 *
9
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
10
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
11
@@ -144,6 +144,39 @@
12
144
    }
144
    }
13
145
145
14
146
    Loader {
146
    Loader {
15
147
        active: d.moveable
16
148
        anchors.fill: parent
17
149
        sourceComponent: Component {
18
150
            MouseArea {
19
151
                acceptedButtons: Qt.LeftButton
20
152
                property bool dragging: false
21
153
                cursorShape: undefined // don't interfere with the cursor shape set by the underlying MirSurfaceItem
22
154
                onPressed: {
23
155
                    if (mouse.button == Qt.LeftButton && mouse.modifiers == Qt.AltModifier) {
24
156
                        d.moveHandler.handlePressedChanged(true, Qt.LeftButton, mouse.x, mouse.y);
25
157
                        dragging = true;
26
158
                        mouse.accepted = true;
27
159
                    } else {
28
160
                        mouse.accepted = false;
29
161
                    }
30
162
                }
31
163
                onPositionChanged: {
32
164
                    if (dragging) {
33
165
                        d.moveHandler.handlePositionChanged(mouse);
34
166
                    }
35
167
                }
36
168
                onReleased: {
37
169
                    if (dragging) {
38
170
                        d.moveHandler.handlePressedChanged(false, Qt.LeftButton);
39
171
                        d.moveHandler.handleReleased();
40
172
                        dragging = false;
41
173
                    }
42
174
                }
43
175
            }
44
176
        }
45
177
    }
46
178
47
179
    Loader {
48
147
        id: touchOverlayLoader
180
        id: touchOverlayLoader
49
148
        active: d.resizeable || d.moveable
181
        active: d.resizeable || d.moveable
50
149
        anchors.top: decorationLoader.top
182
        anchors.top: decorationLoader.top
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-02-27
Lukáš Tinkl (community)		2017-02-22	Approve on 2017-02-22
Review via email: mp+317989@code.launchpad.net