git.iko.soy/unity8
on xenial help sign in
WIP: touch based edge detection and maximizing
9eaba2aLukáš Tinkl
plugins/Ubuntu/Gestures/TouchGestureArea.h+2−2
compare with xenial
unifiedsplit
@@ -76,7 +76,7 @@ public:
76 return *this;
76 return *this;
77 }
77 }
78
78
79− bool operator=(const GestureTouchPoint& rhs) const {
79+ bool operator==(const GestureTouchPoint& rhs) const {
80 if (&rhs == this) return true;
80 if (&rhs == this) return true;
81 return m_id == rhs.m_id &&
81 return m_id == rhs.m_id &&
82 m_pressed == rhs.m_pressed &&
82 m_pressed == rhs.m_pressed &&
@@ -84,7 +84,7 @@ public:
84 m_y == rhs.m_y &&
84 m_y == rhs.m_y &&
85 m_dragging == rhs.m_dragging;
85 m_dragging == rhs.m_dragging;
86 }
86 }
87− bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
88
88
89 void setPos(const QPointF &pos);
89 void setPos(const QPointF &pos);
90
90
qml/Panel/Panel.qml+3−2
@@ -113,6 +113,7 @@ Item {
113 }
113 }
114 onPositionChanged: {
114 onPositionChanged: {
115 if (delegate && delegate.moveHandler.dragging) {
115 if (delegate && delegate.moveHandler.dragging) {
116+ delegate.focus = true;
116 delegate.restoredX = Math.round(mouse.x - delegate.moveHandler.buttonsWidth);
117 delegate.restoredX = Math.round(mouse.x - delegate.moveHandler.buttonsWidth);
117 delegate.restoredY = Math.round(Math.max(mouse.y, PanelState.panelHeight));
118 delegate.restoredY = Math.round(Math.max(mouse.y, PanelState.panelHeight));
118 delegate.restoreFromMaximized(false);
119 delegate.restoreFromMaximized(false);
@@ -120,8 +121,8 @@ Item {
120 }
121 }
121 onReleased: {
122 onReleased: {
122 if (delegate) {
123 if (delegate) {
123− delegate.moveHandler.handlePressedChanged(false, pressedButtons, mouseX, mouseY);
124+ delegate.moveHandler.handlePressedChanged(false, pressedButtons);
124− delegate.moveHandler.handleReleased(mouse);
125+ delegate.moveHandler.handleReleased();
125 delegate.moveHandler.shouldCommitSnapWindow();
126 delegate.moveHandler.shouldCommitSnapWindow();
126 delegate = null;
127 delegate = null;
127 }
128 }
qml/Stages/DecoratedWindow.qml+1−10
@@ -121,7 +121,7 @@ FocusScope {
121 onReleased: {
121 onReleased: {
122 print("!!! Mouse released on decoration")
122 print("!!! Mouse released on decoration")
123 root.shouldCommitSnapWindow();
123 root.shouldCommitSnapWindow();
124− moveHandler.handleReleased(mouse);
124+ moveHandler.handleReleased();
125 }
125 }
126 }
126 }
127
127
@@ -131,15 +131,6 @@ FocusScope {
131 objectName: "moveHandler"
131 objectName: "moveHandler"
132 target: root.parent
132 target: root.parent
133 buttonsWidth: decoration.buttonsWidth
133 buttonsWidth: decoration.buttonsWidth
134−
135− onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(progress)
136− onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(progress)
137− onFakeMaximizeRightAnimationRequested: root.fakeMaximizeRightAnimationRequested(progress)
138− onFakeMaximizeTopLeftAnimationRequested: root.fakeMaximizeTopLeftAnimationRequested(progress)
139− onFakeMaximizeTopRightAnimationRequested: root.fakeMaximizeTopRightAnimationRequested(progress)
140− onFakeMaximizeBottomLeftAnimationRequested: root.fakeMaximizeBottomLeftAnimationRequested(progress)
141− onFakeMaximizeBottomRightAnimationRequested: root.fakeMaximizeBottomRightAnimationRequested(progress)
142− onStopFakeAnimation: root.stopFakeAnimation()
143 onShouldCommitSnapWindow: root.shouldCommitSnapWindow()
134 onShouldCommitSnapWindow: root.shouldCommitSnapWindow()
144 }
135 }
145
136
qml/Stages/DesktopStage.qml+2−1
@@ -358,7 +358,7 @@ AbstractStage {
358 readonly property var surface: model.surface
358 readonly property var surface: model.surface
359 readonly property alias resizeArea: resizeArea
359 readonly property alias resizeArea: resizeArea
360 readonly property alias focusedSurface: decoratedWindow.focusedSurface
360 readonly property alias focusedSurface: decoratedWindow.focusedSurface
361− readonly property alias moveHandler: decoratedWindow.moveHandler
361+ readonly property var moveHandler: touchControls.overlayShown ? touchControls.moveHandler : decoratedWindow.moveHandler
362
362
363 readonly property bool isDash: model.application.appId == "unity8-dash"
363 readonly property bool isDash: model.application.appId == "unity8-dash"
364
364
@@ -773,6 +773,7 @@ AbstractStage {
773 onFakeMaximizeBottomLeftAnimationRequested: decoratedWindow.fakeMaximizeBottomLeftAnimationRequested(progress)
773 onFakeMaximizeBottomLeftAnimationRequested: decoratedWindow.fakeMaximizeBottomLeftAnimationRequested(progress)
774 onFakeMaximizeBottomRightAnimationRequested: decoratedWindow.fakeMaximizeBottomRightAnimationRequested(progress)
774 onFakeMaximizeBottomRightAnimationRequested: decoratedWindow.fakeMaximizeBottomRightAnimationRequested(progress)
775 onStopFakeAnimation: decoratedWindow.stopFakeAnimation()
775 onStopFakeAnimation: decoratedWindow.stopFakeAnimation()
776+ onShouldCommitSnapWindow: fakeRectangle.commit();
776 }
777 }
777
778
778 WindowedFullscreenPolicy {
779 WindowedFullscreenPolicy {
qml/Stages/FakeMaximizeDelegate.qml+1−1
@@ -97,7 +97,7 @@ Rectangle {
97 function commit() {
97 function commit() {
98 if (progress > hintThreshold && edge != -1) {
98 if (progress > hintThreshold && edge != -1) {
99 print("!!! Committing edge", edge, ", progress:", progress);
99 print("!!! Committing edge", edge, ", progress:", progress);
100− target.moveHandler.handlePressedChanged(false, Qt.LeftButton, 0, 0); // cancel the drag
100+ target.moveHandler.handlePressedChanged(false, Qt.LeftButton); // cancel the drag
101 if (edge == Item.Top) {
101 if (edge == Item.Top) {
102 target.maximize();
102 target.maximize();
103 } else if (edge == Item.Left) {
103 } else if (edge == Item.Left) {
qml/Stages/MoveHandler.qml+81−89
@@ -48,7 +48,7 @@ Item {
48 property real distanceY
48 property real distanceY
49 property bool dragging
49 property bool dragging
50
50
51− readonly property int triggerArea: units.gu(3)
51+ readonly property int triggerArea: units.gu(8)
52 property bool nearLeftEdge: target.maximizedLeft
52 property bool nearLeftEdge: target.maximizedLeft
53 property bool nearTopEdge: target.maximized
53 property bool nearTopEdge: target.maximized
54 property bool nearRightEdge: target.maximizedRight
54 property bool nearRightEdge: target.maximizedRight
@@ -101,7 +101,7 @@ Item {
101 }
101 }
102 }
102 }
103
103
104− function handlePositionChanged(mouse) {
104+ function handlePositionChanged(mouse, sensingPoints) {
105 if (priv.dragging) {
105 if (priv.dragging) {
106 Mir.cursorName = "grabbing";
106 Mir.cursorName = "grabbing";
107
107
@@ -118,99 +118,91 @@ Item {
118 target.requestedX = Math.round(pos.x - priv.distanceX);
118 target.requestedX = Math.round(pos.x - priv.distanceX);
119 target.requestedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
119 target.requestedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));
120
120
121−// var globalPos = mapToItem(null, mouse.x, mouse.y);
121+ if (sensingPoints) {
122−// var globalX = globalPos.x;
122+ print("!!! Detecting edges/corners in touch mode")
123−// var globalY = globalPos.y;
124−// if (globalX < priv.triggerArea && globalY < PanelState.panelHeight) { // top left
123+ if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight
125−// if (target.canBeCornerMaximized) {
124+ && target.canBeCornerMaximized) { // top left
126−// priv.progress = priv.progressInCorner(0, PanelState.panelHeight, globalX, globalY);
125+ priv.progress = priv.progressInCorner(0, PanelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
127−// priv.resetEdges();
126+ priv.resetEdges();
128−// priv.nearTopLeftCorner = true;
127+ priv.nearTopLeftCorner = true;
129−// root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
128+ root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
130−// }
131−// } else if (globalX > stageWidth - priv.triggerArea && globalY < PanelState.panelHeight) { // top right
129+ } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < PanelState.panelHeight
132−// if (target.canBeCornerMaximized) {
130+ && target.canBeCornerMaximized) { // top right
133−// priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, globalX, globalY);
131+ priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);
134−// priv.resetEdges();
132+ priv.resetEdges();
135−// priv.nearTopRightCorner = true;
133+ priv.nearTopRightCorner = true;
136−// root.fakeMaximizeTopRightAnimationRequested(priv.progress);
134+ root.fakeMaximizeTopRightAnimationRequested(priv.progress);
137−// }
138−// } else if (globalX < priv.triggerArea && globalY > stageHeight - priv.triggerArea) { // bottom left
135+ } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > stageHeight - priv.triggerArea
139−// if (target.canBeCornerMaximized) {
136+ && target.canBeCornerMaximized) { // bottom left
140−// priv.progress = priv.progressInCorner(0, stageHeight, globalX, globalY);
137+ priv.progress = priv.progressInCorner(0, stageHeight, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
141−// priv.resetEdges();
138+ priv.resetEdges();
142−// priv.nearBottomLeftCorner = true;
139+ priv.nearBottomLeftCorner = true;
143−// root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
140+ root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
144−// }
145−// } else if (globalX > stageWidth - priv.triggerArea && globalY > stageHeight - priv.triggerArea) { // bottom right
141+ } else if (sensingPoints.bottomRight.x > stageWidth - priv.triggerArea && sensingPoints.bottomRight.y > stageHeight - priv.triggerArea
146−// if (target.canBeCornerMaximized) {
142+ && target.canBeCornerMaximized) { // bottom right
147−// priv.progress = priv.progressInCorner(stageWidth, stageHeight, globalX, globalY);
143+ priv.progress = priv.progressInCorner(stageWidth, stageHeight, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
148−// priv.resetEdges();
144+ priv.resetEdges();
149−// priv.nearBottomRightCorner = true;
145+ priv.nearBottomRightCorner = true;
150−// root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
146+ root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
151−// }
152−// } else if (globalX < priv.triggerArea) { // left
153−// if (target.canBeMaximizedLeftRight) {
147+ } else if (sensingPoints.topLeft.x < priv.triggerArea && target.canBeMaximizedLeftRight) { // left
154−// priv.progress = MathUtils.clampAndProject(globalX, priv.triggerArea, 0, 0, 1);
148+ priv.progress = MathUtils.clampAndProject(sensingPoints.topLeft.x, priv.triggerArea, 0, 0, 1);
155−// priv.resetEdges();
149+ priv.resetEdges();
156−// priv.nearLeftEdge = true;
150+ priv.nearLeftEdge = true;
157−// root.fakeMaximizeLeftAnimationRequested(priv.progress);
151+ root.fakeMaximizeLeftAnimationRequested(priv.progress);
158−// }
159−// } else if (globalX > stageWidth - priv.triggerArea) { // right
160−// if (target.canBeMaximizedLeftRight) {
152+ } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
161−// priv.progress = MathUtils.clampAndProject(globalX, stageWidth - priv.triggerArea, stageWidth, 0, 1);
153+ priv.progress = MathUtils.clampAndProject(sensingPoints.topRight.x, stageWidth - priv.triggerArea, stageWidth, 0, 1);
162−// priv.resetEdges();
154+ priv.resetEdges();
163−// priv.nearRightEdge = true;
155+ priv.nearRightEdge = true;
164−// root.fakeMaximizeRightAnimationRequested(priv.progress);
156+ root.fakeMaximizeRightAnimationRequested(priv.progress);
165−// }
166−// } else if (globalY < PanelState.panelHeight) { // top
157+ } else if (sensingPoints.topLeft.y < PanelState.panelHeight && target.canBeMaximized) { // top
167−// if (target.canBeMaximized) {
168−// priv.progress = MathUtils.clampAndProject(globalY, Math.max(PanelState.panelHeight, priv.triggerArea), 0, 0, 1);
158+ priv.progress = MathUtils.clampAndProject(sensingPoints.topLeft.y, Math.max(PanelState.panelHeight, priv.triggerArea), 0, 0, 1);
169−// priv.resetEdges();
159+ priv.resetEdges();
170−// priv.nearTopEdge = true;
160+ priv.nearTopEdge = true;
171−// root.fakeMaximizeAnimationRequested(priv.progress);
161+ root.fakeMaximizeAnimationRequested(priv.progress);
172−// }
173−// } else if (priv.nearLeftEdge || priv.nearRightEdge || priv.nearTopEdge || priv.nearTopLeftCorner || priv.nearTopRightCorner ||
162+ } else if (priv.nearLeftEdge || priv.nearRightEdge || priv.nearTopEdge || priv.nearTopLeftCorner || priv.nearTopRightCorner ||
174−// priv.nearBottomLeftCorner || priv.nearBottomRightCorner) {
163+ priv.nearBottomLeftCorner || priv.nearBottomRightCorner) {
175−// print("!!! Exited")
164+ print("!!! Exited")
176−// priv.progress = 0;
165+ priv.progress = 0;
177−// priv.resetEdges();
166+ priv.resetEdges();
178−// root.stopFakeAnimation();
167+ root.stopFakeAnimation();
168+ }
179−// }
169+ }
180 }
170 }
181 }
171 }
182
172
183− function handleReleased(mouse) {
173+ function handleReleased(touchMode) {
174+ if (touchMode) {
175+ if (priv.progress < 0.3) { // cancel the preview shape if under 30%
176+ priv.progress = 0;
177+ priv.resetEdges();
178+ root.stopFakeAnimation();
179+ } else if (priv.nearLeftEdge) {
180+ target.maximizeLeft();
181+ priv.resetEdges();
182+ } else if (priv.nearTopEdge) {
183+ target.maximize();
184+ priv.resetEdges();
185+ } else if (priv.nearRightEdge) {
186+ target.maximizeRight();
187+ priv.resetEdges();
188+ } else if (priv.nearTopLeftCorner) {
189+ target.maximizeTopLeft();
190+ priv.resetEdges();
191+ } else if (priv.nearTopRightCorner) {
192+ target.maximizeTopRight();
193+ priv.resetEdges();
194+ } else if (priv.nearBottomLeftCorner) {
195+ target.maximizeBottomLeft();
196+ priv.resetEdges();
197+ } else if (priv.nearBottomRightCorner) {
198+ target.maximizeBottomRight();
199+ priv.resetEdges();
200+ }
184− if (mouse.button == Qt.LeftButton && (target.state == "normal" || target.state == "restored") && priv.progress == 0) {
201+ } else if ((target.state == "normal" || target.state == "restored") && priv.progress == 0) {
185 // save the x/y to restore to
202 // save the x/y to restore to
186 print("!!! Saving restoredX/Y")
203 print("!!! Saving restoredX/Y")
187 target.restoredX = target.x;
204 target.restoredX = target.x;
188 target.restoredY = target.y;
205 target.restoredY = target.y;
189− } /*else if (priv.progress < 0.3) { // cancel the preview shape if under 30%
206+ }
190− priv.progress = 0;
191− priv.resetEdges();
192− root.stopFakeAnimation();
193− } else if (priv.nearLeftEdge) {
194− target.maximizeLeft();
195− priv.resetEdges();
196− } else if (priv.nearTopEdge) {
197− target.maximize();
198− priv.resetEdges();
199− } else if (priv.nearRightEdge) {
200− target.maximizeRight();
201− priv.resetEdges();
202− } else if (priv.nearTopLeftCorner) {
203− target.maximizeTopLeft();
204− priv.resetEdges();
205− } else if (priv.nearTopRightCorner) {
206− target.maximizeTopRight();
207− priv.resetEdges();
208− } else if (priv.nearBottomLeftCorner) {
209− target.maximizeBottomLeft();
210− priv.resetEdges();
211− } else if (priv.nearBottomRightCorner) {
212− target.maximizeBottomRight();
213− priv.resetEdges();
214− }*/
215 }
207 }
216}
208}
qml/Stages/WindowControlsOverlay.qml+32−5
@@ -32,6 +32,7 @@ Item {
32
32
33 // to be read from outside
33 // to be read from outside
34 readonly property alias overlayShown: overlay.visible
34 readonly property alias overlayShown: overlay.visible
35+ readonly property alias moveHandler: moveHandler
35
36
36 signal fakeMaximizeAnimationRequested(real progress)
37 signal fakeMaximizeAnimationRequested(real progress)
37 signal fakeMaximizeLeftAnimationRequested(real progress)
38 signal fakeMaximizeLeftAnimationRequested(real progress)
@@ -41,6 +42,7 @@ Item {
41 signal fakeMaximizeBottomLeftAnimationRequested(real progress)
42 signal fakeMaximizeBottomLeftAnimationRequested(real progress)
42 signal fakeMaximizeBottomRightAnimationRequested(real progress)
43 signal fakeMaximizeBottomRightAnimationRequested(real progress)
43 signal stopFakeAnimation()
44 signal stopFakeAnimation()
45+ signal shouldCommitSnapWindow()
44
46
45 TouchGestureArea {
47 TouchGestureArea {
46 id: gestureArea
48 id: gestureArea
@@ -65,15 +67,15 @@ Item {
65 if (recognizedDrag) {
67 if (recognizedDrag) {
66 moveHandler.handlePressedChanged(true, Qt.LeftButton, tp.x, tp.y);
68 moveHandler.handlePressedChanged(true, Qt.LeftButton, tp.x, tp.y);
67 } else if (!mouseArea.containsPress) { // prevent interfering with the central piece drag/move
69 } else if (!mouseArea.containsPress) { // prevent interfering with the central piece drag/move
68− // FIXME!!!
69− moveHandler.handlePressedChanged(false, Qt.LeftButton, tp.x, tp.y);
70+ moveHandler.handlePressedChanged(false, Qt.LeftButton);
71+ moveHandler.handleReleased(true);
70 }
72 }
71 }
73 }
72
74
73 readonly property point tp: recognizedPress ? Qt.point(touchPoints[0].x, touchPoints[0].y) : Qt.point(-1, -1)
75 readonly property point tp: recognizedPress ? Qt.point(touchPoints[0].x, touchPoints[0].y) : Qt.point(-1, -1)
74 onUpdated: {
76 onUpdated: {
75 if (recognizedDrag) {
77 if (recognizedDrag) {
76− moveHandler.handlePositionChanged(tp);
78+ moveHandler.handlePositionChanged(tp, priv.getSensingPoints());
77 }
79 }
78 }
80 }
79 }
81 }
@@ -89,6 +91,28 @@ Item {
89 id: priv
91 id: priv
90 readonly property var resizeArea: root.target && root.target.resizeArea ? root.target.resizeArea : null
92 readonly property var resizeArea: root.target && root.target.resizeArea ? root.target.resizeArea : null
91 readonly property bool ensureWindow: root.target.state == "normal" || root.target.state == "restored"
93 readonly property bool ensureWindow: root.target.state == "normal" || root.target.state == "restored"
94+
95+ function getSensingPoints() {
96+ var xPoints = [];
97+ var yPoints = [];
98+ for (var i = 0; i < gestureArea.touchPoints.length; i++) {
99+ var pt = gestureArea.touchPoints[i];
100+ xPoints.push(Math.round(pt.x));
101+ yPoints.push(Math.round(pt.y));
102+ }
103+
104+ var leftmost = Math.min.apply(Math, xPoints);
105+ var rightmost = Math.max.apply(Math, xPoints);
106+ var topmost = Math.min.apply(Math, yPoints);
107+ var bottommost = Math.max.apply(Math, yPoints);
108+
109+ return {
110+ topLeft: mapToItem(target.parent, leftmost, topmost),
111+ topRight: mapToItem(target.parent, rightmost, topmost),
112+ bottomLeft: mapToItem(target.parent, leftmost, bottommost),
113+ bottomRight: mapToItem(target.parent, rightmost, bottommost)
114+ }
115+ }
92 }
116 }
93
117
94 // the visual overlay
118 // the visual overlay
@@ -123,7 +147,10 @@ Item {
123
147
124 onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
148 onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
125 onPositionChanged: moveHandler.handlePositionChanged(mouse)
149 onPositionChanged: moveHandler.handlePositionChanged(mouse)
150+ onReleased: {
151+ root.shouldCommitSnapWindow();
126− onReleased: moveHandler.handleReleased(mouse)
152+ moveHandler.handleReleased();
153+ }
127 }
154 }
128
155
129 MoveHandler {
156 MoveHandler {
@@ -154,7 +181,7 @@ Item {
154 }
181 }
155
182
156 overlayTimer.stop();
183 overlayTimer.stop();
157− mouse.accepted = root.contains(Qt.point(mouse.x, mouse.y));
184+ mouse.accepted = root.contains(mapToItem(root.target, mouse.x, mouse.y));
158 }
185 }
159 propagateComposedEvents: true
186 propagateComposedEvents: true
160 }
187 }