git.iko.soy/unity8
on xenial help sign in
merge with prereq
d1b0f8cMichael Zanetti
plugins/Cursor/MousePointer.cpp+1−1
compare with xenial
unifiedsplit
@@ -34,7 +34,7 @@ MousePointer::MousePointer(QQuickItem *parent)
34{
34{
35}
35}
36
36
37−void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,
37+void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
38 Qt::KeyboardModifiers modifiers)
38 Qt::KeyboardModifiers modifiers)
39{
39{
40 if (!parentItem()) {
40 if (!parentItem()) {
plugins/Cursor/MousePointer.h+1−1
@@ -39,7 +39,7 @@ public:
39 qreal hotspotY() const override { return m_hotspotY; }
39 qreal hotspotY() const override { return m_hotspotY; }
40
40
41public Q_SLOTS:
41public Q_SLOTS:
42− void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,
42+ void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
43 Qt::KeyboardModifiers modifiers) override;
43 Qt::KeyboardModifiers modifiers) override;
44
44
45protected:
45protected:
qml/Stages/DesktopStage.qml+1
@@ -242,6 +242,7 @@ Rectangle {
242 onClose: ApplicationManager.stopApplication(model.appId)
242 onClose: ApplicationManager.stopApplication(model.appId)
243 onMaximize: appDelegate.maximize()
243 onMaximize: appDelegate.maximize()
244 onMinimize: appDelegate.minimize()
244 onMinimize: appDelegate.minimize()
245+ onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
245 }
246 }
246 }
247 }
247 }
248 }
qml/Stages/WindowDecoration.qml+1−1
@@ -51,7 +51,7 @@ MouseArea {
51 Mir.cursorName = "";
51 Mir.cursorName = "";
52 }
52 }
53 }
53 }
54− onMouseXChanged: {
54+ onPositionChanged: {
55 if (priv.dragging) {
55 if (priv.dragging) {
56 var pos = mapToItem(root.target.parent, mouseX, mouseY);
56 var pos = mapToItem(root.target.parent, mouseX, mouseY);
57 root.target.x = pos.x - priv.distanceX;
57 root.target.x = pos.x - priv.distanceX;
tests/qmltests/Stages/tst_WindowResizeArea.qml−19
@@ -150,25 +150,6 @@ Item {
150 compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));
150 compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));
151 }
151 }
152
152
153− function test_saveRestorePosition() {
154− var initialWindowX = fakeWindow.x;
155− var initialWindowY = fakeWindow.y;
156−
157− var moveDelta = units.gu(5);
158−
159− fakeWindow.x = initialWindowX + moveDelta
160− fakeWindow.y = initialWindowY + moveDelta
161−
162− // This will destroy the window and recreate it
163− windowLoader.active = false;
164− waitForRendering(root);
165− windowLoader.active = true;
166−
167− // Make sure it's again where we left it before destroying
168− tryCompare(fakeWindow, "x", initialWindowX + moveDelta)
169− tryCompare(fakeWindow, "y", initialWindowX + moveDelta)
170− }
171−
172 function test_saveRestoreSize() {
153 function test_saveRestoreSize() {
173 var initialWindowX = fakeWindow.x;
154 var initialWindowX = fakeWindow.x;
174 var initialWindowY = fakeWindow.y;
155 var initialWindowY = fakeWindow.y;