@@ -19,16 +19,14 @@ import Unity.Application 0.1 // For Mir singleton
1919import Ubuntu.Components 1.3
2020import Utils 0.1
2121import "../Components"
22−import "../Components/PanelState"
2322
2423QtObject {
2524 id: root
2625
2726 property Item target // appDelegate
28− property int stageWidth
29− property int stageHeight
3027 property real buttonsWidth: 0
31− property PanelState panelState
28+ property Item boundsItem
29+ property real boundsTopMargin: 0
3230
3331 readonly property bool dragging: priv.dragging
3432
@@ -80,7 +78,10 @@ QtObject {
8078 // length of the triggerArea square diagonal
8179 var diagLength = Math.sqrt(2 * priv.triggerArea * priv.triggerArea);
8280 var ratio = 1 - (distance / diagLength);
83− return bx > 0 && bx <= stageWidth && by > 0 && by <= stageHeight ? ratio : 1; // everything "outside" of our square from the center is 1
81+
82+ // everything "outside" of our square from the center is 1
83+ var mousePosBoundsCoords = target.mapToItem(root.boundsItem, bx, by);
84+ return root.boundsItem.contains(mousePosBoundsCoords) ? ratio : 1;
8485 }
8586 property real progress: 0
8687 }
@@ -118,35 +119,38 @@ QtObject {
118119 target.requestRestore();
119120 }
120121
121− var pos = mapToItem(target.parent, mouse.x, mouse.y);
122+ var pos = mapToItem(target.parent, mouse.x, mouse.y); // How can that work if we're just a QtObject (not an Item)?
123+ var bounds = boundsItem.mapToItem(target.parent, 0, 0, boundsItem.width, boundsItem.height);
124+ bounds.y += boundsTopMargin;
125+ bounds.height -= boundsTopMargin;
122126 // Use integer coordinate values to ensure that target is left in a pixel-aligned
123127 // position. Mouse movement could have subpixel precision, yielding a fractional
124128 // mouse position.
125129 target.windowedX = Math.round(pos.x - priv.distanceX);
126− target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, panelState.panelHeight));
130+ target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, bounds.top));
127131
128132 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay
129− if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < panelState.panelHeight + priv.triggerArea
133+ if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < bounds.top + priv.triggerArea
130134 && target.canBeCornerMaximized) { // top left
131− priv.progress = priv.progressInCorner(0, panelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
135+ priv.progress = priv.progressInCorner(bounds.left, bounds.top, sensingPoints.topLeft.x, sensingPoints.topLeft.y);
132136 priv.resetEdges();
133137 priv.nearTopLeftCorner = true;
134138 root.fakeMaximizeTopLeftAnimationRequested(priv.progress);
135− } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < panelState.panelHeight + priv.triggerArea
139+ } else if (sensingPoints.topRight.x > bounds.right - priv.triggerArea && sensingPoints.topRight.y < bounds.top + priv.triggerArea
136140 && target.canBeCornerMaximized) { // top right
137− priv.progress = priv.progressInCorner(stageWidth, panelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);
141+ priv.progress = priv.progressInCorner(bounds.right, bounds.top, sensingPoints.topRight.x, sensingPoints.topRight.y);
138142 priv.resetEdges();
139143 priv.nearTopRightCorner = true;
140144 root.fakeMaximizeTopRightAnimationRequested(priv.progress);
141− } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > stageHeight - priv.triggerArea
145+ } else if (sensingPoints.bottomLeft.x < priv.triggerArea && sensingPoints.bottomLeft.y > bounds.bottom - priv.triggerArea
142146 && target.canBeCornerMaximized) { // bottom left
143− priv.progress = priv.progressInCorner(0, stageHeight, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
147+ priv.progress = priv.progressInCorner(bounds.left, bounds.bottom, sensingPoints.bottomLeft.x, sensingPoints.bottomLeft.y);
144148 priv.resetEdges();
145149 priv.nearBottomLeftCorner = true;
146150 root.fakeMaximizeBottomLeftAnimationRequested(priv.progress);
147− } else if (sensingPoints.bottomRight.x > stageWidth - priv.triggerArea && sensingPoints.bottomRight.y > stageHeight - priv.triggerArea
151+ } else if (sensingPoints.bottomRight.x > bounds.right - priv.triggerArea && sensingPoints.bottomRight.y > bounds.bottom - priv.triggerArea
148152 && target.canBeCornerMaximized) { // bottom right
149− priv.progress = priv.progressInCorner(stageWidth, stageHeight, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
153+ priv.progress = priv.progressInCorner(bounds.right, bounds.bottom, sensingPoints.bottomRight.x, sensingPoints.bottomRight.y);
150154 priv.resetEdges();
151155 priv.nearBottomRightCorner = true;
152156 root.fakeMaximizeBottomRightAnimationRequested(priv.progress);
@@ -155,13 +159,13 @@ QtObject {
155159 priv.resetEdges();
156160 priv.nearLeftEdge = true;
157161 root.fakeMaximizeLeftAnimationRequested(priv.progress);
158− } else if (sensingPoints.right.x > stageWidth - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
159− priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, stageWidth - priv.triggerArea, stageWidth, 0, 1);
162+ } else if (sensingPoints.right.x > bounds.right - priv.triggerArea && target.canBeMaximizedLeftRight) { // right
163+ priv.progress = MathUtils.clampAndProject(sensingPoints.right.x, bounds.right - priv.triggerArea, bounds.right, 0, 1);
160164 priv.resetEdges();
161165 priv.nearRightEdge = true;
162166 root.fakeMaximizeRightAnimationRequested(priv.progress);
163− } else if (sensingPoints.top.y < panelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top
164− priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, panelState.panelHeight + priv.triggerArea, 0, 0, 1);
167+ } else if (sensingPoints.top.y < bounds.top + priv.triggerArea && target.canBeMaximized) { // top
168+ priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, bounds.top + priv.triggerArea, 0, 0, 1);
165169 priv.resetEdges();
166170 priv.nearTopEdge = true;
167171 root.fakeMaximizeAnimationRequested(priv.progress);