1
=== modified file 'qml/Stages/WindowDecoration.qml'
2
--- qml/Stages/WindowDecoration.qml	2016-05-02 11:35:53 +0000
3
+++ qml/Stages/WindowDecoration.qml	2016-06-15 16:58:24 +0000
4
@@ -27,7 +27,7 @@
5
27
    property Item target
27
    property Item target
6
28
    property alias title: titleLabel.text
28
    property alias title: titleLabel.text
7
29
    property bool active: false
29
    property bool active: false
9
30
    hoverEnabled: true
30
    acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
10
31
31
11
32
    signal closeClicked()
32
    signal closeClicked()
12
33
    signal minimizeClicked()
33
    signal minimizeClicked()
13
@@ -35,7 +35,11 @@
14
35
    signal maximizeHorizontallyClicked()
35
    signal maximizeHorizontallyClicked()
15
36
    signal maximizeVerticallyClicked()
36
    signal maximizeVerticallyClicked()
16
37
37
18
38
    onDoubleClicked: root.maximizeClicked()
38
    onDoubleClicked: {
19
39
        if (mouse.button == Qt.LeftButton) {
20
40
            root.maximizeClicked();
21
41
        }
22
42
    }
23
39
43
24
40
    QtObject {
44
    QtObject {
25
41
        id: priv
45
        id: priv
26
@@ -45,7 +49,7 @@
27
45
    }
49
    }
28
46
50
29
47
    onPressedChanged: {
51
    onPressedChanged: {
31
48
        if (pressed) {
52
        if (pressed && pressedButtons == Qt.LeftButton) {
32
49
            var pos = mapToItem(root.target, mouseX, mouseY);
53
            var pos = mapToItem(root.target, mouseX, mouseY);
33
50
            priv.distanceX = pos.x;
54
            priv.distanceX = pos.x;
34
51
            priv.distanceY = pos.y;
55
            priv.distanceY = pos.y;
35
@@ -65,6 +69,9 @@
36
65
        }
69
        }
37
66
    }
70
    }
38
67
71
39
72
    // do not let unhandled wheel event pass thru the decoration
40
73
    onWheel: wheel.accepted = true;
41
74
42
68
    Rectangle {
75
    Rectangle {
43
69
        anchors.fill: parent
76
        anchors.fill: parent
44
70
        anchors.bottomMargin: -radius
77
        anchors.bottomMargin: -radius
45
71
78
46
=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
47
--- tests/qmltests/Stages/tst_DesktopStage.qml	2016-05-06 08:16:07 +0000
48
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-06-15 16:58:24 +0000
49
@@ -89,6 +89,13 @@
50
89
                topLevelSurfaceList: topSurfaceList
89
                topLevelSurfaceList: topSurfaceList
51
90
            }
90
            }
52
91
        }
91
        }
53
92
54
93
        MouseArea {
55
94
            id: clickThroughTester
56
95
            anchors.fill: desktopStageLoader.item
57
96
            acceptedButtons: Qt.AllButtons
58
97
            hoverEnabled: true
59
98
        }
60
92
    }
99
    }
61
93
100
62
94
    Rectangle {
101
    Rectangle {
63
@@ -140,6 +147,11 @@
64
140
        }
147
        }
65
141
    }
148
    }
66
142
149
67
150
    SignalSpy {
68
151
        id: mouseEaterSpy
69
152
        target: clickThroughTester
70
153
    }
71
154
72
143
    UnityTestCase {
155
    UnityTestCase {
73
144
        id: testCase
156
        id: testCase
74
145
        name: "DesktopStage"
157
        name: "DesktopStage"
75
@@ -179,6 +191,7 @@
76
179
            desktopStageLoader.active = true;
191
            desktopStageLoader.active = true;
77
180
            tryCompare(desktopStageLoader, "status", Loader.Ready);
192
            tryCompare(desktopStageLoader, "status", Loader.Ready);
78
181
193
79
194
            mouseEaterSpy.clear();
80
182
        }
195
        }
81
183
196
82
184
        function waitUntilAppSurfaceShowsUp(surfaceId) {
197
        function waitUntilAppSurfaceShowsUp(surfaceId) {
83
@@ -654,5 +667,56 @@
84
654
            var closeButton = findChild(dashAppDelegate, "closeWindowButton");
667
            var closeButton = findChild(dashAppDelegate, "closeWindowButton");
85
655
            tryCompare(closeButton, "visible", false);
668
            tryCompare(closeButton, "visible", false);
86
656
        }
669
        }
87
670
88
671
        function test_eatWindowDecorationMouseEvents_data() {
89
672
            return [
90
673
                {tag: "left mouse click", signalName: "clicked", button: Qt.LeftButton },
91
674
                {tag: "right mouse click", signalName: "clicked", button: Qt.RightButton },
92
675
                {tag: "middle mouse click", signalName: "clicked", button: Qt.MiddleButton },
93
676
                {tag: "mouse wheel", signalName: "wheel", button: Qt.MiddleButton },
94
677
                {tag: "double click (RMB)", signalName: "doubleClicked", button: Qt.RightButton },
95
678
            ]
96
679
        }
97
680
98
681
        function test_eatWindowDecorationMouseEvents(data) {
99
682
            var dialerAppDelegate = startApplication("dialer-app");
100
683
            verify(dialerAppDelegate);
101
684
            var decoration = findChild(dialerAppDelegate, "appWindowDecoration");
102
685
            verify(decoration);
103
686
104
687
            mouseEaterSpy.signalName = data.signalName;
105
688
            if (data.signalName === "wheel") {
106
689
                mouseWheel(decoration, decoration.width/2, decoration.height/2, 20, 20);
107
690
            } else if (data.signalName === "clicked") {
108
691
                mouseClick(decoration, decoration.width/2, decoration.height/2, data.button);
109
692
            } else {
110
693
                mouseDoubleClick(decoration, decoration.width/2, decoration.height/2, data.button);
111
694
                tryCompare(dialerAppDelegate, "maximized", false);
112
695
            }
113
696
114
697
            tryCompare(mouseEaterSpy, "count", 0);
115
698
        }
116
699
117
700
        function test_canMoveWindowWithLeftMouseButtonOnly_data() {
118
701
            return [
119
702
                {tag: "left mouse button", button: Qt.LeftButton },
120
703
                {tag: "right mouse button", button: Qt.RightButton },
121
704
                {tag: "middle mouse button", button: Qt.MiddleButton }
122
705
            ]
123
706
        }
124
707
125
708
        function test_canMoveWindowWithLeftMouseButtonOnly(data) {
126
709
            var appDelegate = startApplication("dialer-app");
127
710
            verify(appDelegate);
128
711
129
712
            var posBefore = Qt.point(appDelegate.x, appDelegate.y);
130
713
131
714
            mousePress(appDelegate, appDelegate.width / 2, units.gu(1), data.button);
132
715
            mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100), undefined /* delay */, data.button);
133
716
134
717
            var posAfter = Qt.point(appDelegate.x, appDelegate.y);
135
718
136
719
            tryCompareFunction(function(){return posBefore == posAfter;}, data.button !== Qt.LeftButton ? true : false);
137
720
        }
138
657
    }
721
    }
139
658
}
722
}
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-15
Daniel d'Andrada (community)		2016-06-03	Needs Fixing on 2016-06-13
Review via email: mp+296438@code.launchpad.net
1	=== modified file 'qml/Stages/WindowDecoration.qml'
2	--- qml/Stages/WindowDecoration.qml 2016-05-02 11:35:53 +0000
3	+++ qml/Stages/WindowDecoration.qml 2016-06-15 16:58:24 +0000
4	@@ -27,7 +27,7 @@
5	27	property Item target	27	property Item target
6	28	property alias title: titleLabel.text	28	property alias title: titleLabel.text
7	29	property bool active: false	29	property bool active: false
9	30	hoverEnabled: true	30	acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
10	31		31
11	32	signal closeClicked()	32	signal closeClicked()
12	33	signal minimizeClicked()	33	signal minimizeClicked()
13	@@ -35,7 +35,11 @@
14	35	signal maximizeHorizontallyClicked()	35	signal maximizeHorizontallyClicked()
15	36	signal maximizeVerticallyClicked()	36	signal maximizeVerticallyClicked()
16	37		37
18	38	onDoubleClicked: root.maximizeClicked()	38	onDoubleClicked: {
19			39	if (mouse.button == Qt.LeftButton) {
20			40	root.maximizeClicked();
21			41	}
22			42	}
23	39		43
24	40	QtObject {	44	QtObject {
25	41	id: priv	45	id: priv
26	@@ -45,7 +49,7 @@
27	45	}	49	}
28	46		50
29	47	onPressedChanged: {	51	onPressedChanged: {
31	48	if (pressed) {	52	if (pressed && pressedButtons == Qt.LeftButton) {
32	49	var pos = mapToItem(root.target, mouseX, mouseY);	53	var pos = mapToItem(root.target, mouseX, mouseY);
33	50	priv.distanceX = pos.x;	54	priv.distanceX = pos.x;
34	51	priv.distanceY = pos.y;	55	priv.distanceY = pos.y;
35	@@ -65,6 +69,9 @@
36	65	}	69	}
37	66	}	70	}
38	67		71
39			72	// do not let unhandled wheel event pass thru the decoration
40			73	onWheel: wheel.accepted = true;
41			74
42	68	Rectangle {	75	Rectangle {
43	69	anchors.fill: parent	76	anchors.fill: parent
44	70	anchors.bottomMargin: -radius	77	anchors.bottomMargin: -radius
45	71		78
46	=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
47	--- tests/qmltests/Stages/tst_DesktopStage.qml 2016-05-06 08:16:07 +0000
48	+++ tests/qmltests/Stages/tst_DesktopStage.qml 2016-06-15 16:58:24 +0000
49	@@ -89,6 +89,13 @@
50	89	topLevelSurfaceList: topSurfaceList	89	topLevelSurfaceList: topSurfaceList
51	90	}	90	}
52	91	}	91	}
53			92
54			93	MouseArea {
55			94	id: clickThroughTester
56			95	anchors.fill: desktopStageLoader.item
57			96	acceptedButtons: Qt.AllButtons
58			97	hoverEnabled: true
59			98	}
60	92	}	99	}
61	93		100
62	94	Rectangle {	101	Rectangle {
63	@@ -140,6 +147,11 @@
64	140	}	147	}
65	141	}	148	}
66	142		149
67			150	SignalSpy {
68			151	id: mouseEaterSpy
69			152	target: clickThroughTester
70			153	}
71			154
72	143	UnityTestCase {	155	UnityTestCase {
73	144	id: testCase	156	id: testCase
74	145	name: "DesktopStage"	157	name: "DesktopStage"
75	@@ -179,6 +191,7 @@
76	179	desktopStageLoader.active = true;	191	desktopStageLoader.active = true;
77	180	tryCompare(desktopStageLoader, "status", Loader.Ready);	192	tryCompare(desktopStageLoader, "status", Loader.Ready);
78	181		193
79			194	mouseEaterSpy.clear();
80	182	}	195	}
81	183		196
82	184	function waitUntilAppSurfaceShowsUp(surfaceId) {	197	function waitUntilAppSurfaceShowsUp(surfaceId) {
83	@@ -654,5 +667,56 @@
84	654	var closeButton = findChild(dashAppDelegate, "closeWindowButton");	667	var closeButton = findChild(dashAppDelegate, "closeWindowButton");
85	655	tryCompare(closeButton, "visible", false);	668	tryCompare(closeButton, "visible", false);
86	656	}	669	}
87			670
88			671	function test_eatWindowDecorationMouseEvents_data() {
89			672	return [
90			673	{tag: "left mouse click", signalName: "clicked", button: Qt.LeftButton },
91			674	{tag: "right mouse click", signalName: "clicked", button: Qt.RightButton },
92			675	{tag: "middle mouse click", signalName: "clicked", button: Qt.MiddleButton },
93			676	{tag: "mouse wheel", signalName: "wheel", button: Qt.MiddleButton },
94			677	{tag: "double click (RMB)", signalName: "doubleClicked", button: Qt.RightButton },
95			678	]
96			679	}
97			680
98			681	function test_eatWindowDecorationMouseEvents(data) {
99			682	var dialerAppDelegate = startApplication("dialer-app");
100			683	verify(dialerAppDelegate);
101			684	var decoration = findChild(dialerAppDelegate, "appWindowDecoration");
102			685	verify(decoration);
103			686
104			687	mouseEaterSpy.signalName = data.signalName;
105			688	if (data.signalName === "wheel") {
106			689	mouseWheel(decoration, decoration.width/2, decoration.height/2, 20, 20);
107			690	} else if (data.signalName === "clicked") {
108			691	mouseClick(decoration, decoration.width/2, decoration.height/2, data.button);
109			692	} else {
110			693	mouseDoubleClick(decoration, decoration.width/2, decoration.height/2, data.button);
111			694	tryCompare(dialerAppDelegate, "maximized", false);
112			695	}
113			696
114			697	tryCompare(mouseEaterSpy, "count", 0);
115			698	}
116			699
117			700	function test_canMoveWindowWithLeftMouseButtonOnly_data() {
118			701	return [
119			702	{tag: "left mouse button", button: Qt.LeftButton },
120			703	{tag: "right mouse button", button: Qt.RightButton },
121			704	{tag: "middle mouse button", button: Qt.MiddleButton }
122			705	]
123			706	}
124			707
125			708	function test_canMoveWindowWithLeftMouseButtonOnly(data) {
126			709	var appDelegate = startApplication("dialer-app");
127			710	verify(appDelegate);
128			711
129			712	var posBefore = Qt.point(appDelegate.x, appDelegate.y);
130			713
131			714	mousePress(appDelegate, appDelegate.width / 2, units.gu(1), data.button);
132			715	mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100), undefined /* delay */, data.button);
133			716
134			717	var posAfter = Qt.point(appDelegate.x, appDelegate.y);
135			718
136			719	tryCompareFunction(function(){return posBefore == posAfter;}, data.button !== Qt.LeftButton ? true : false);
137			720	}
138	657	}	721	}
139	658	}	722	}