@@ -55,8 +55,8 @@ MouseArea {
5555
5656 function updateNormalGeometry() {
5757 if (root.target.state == "normal") {
58− normalX = root.target.requestedX
59− normalY = root.target.requestedY
58+ normalX = root.target.windowedX
59+ normalY = root.target.windowedY
6060 normalWidth = root.target.width
6161 normalHeight = root.target.height
6262 }
@@ -73,16 +73,16 @@ MouseArea {
7373
7474 function loadWindowState() {
7575 var windowGeometry = windowStateStorage.getGeometry(root.windowId,
76− Qt.rect(target.requestedX, target.requestedY, defaultWidth, defaultHeight));
76+ Qt.rect(target.windowedX, target.windowedY, defaultWidth, defaultHeight));
7777
7878
7979 print("loading Window state!", root.windowId, windowGeometry.width, windowGeometry.height)
80− target.requestedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
81− target.requestedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
80+ target.windowedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
81+ target.windowedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
8282 root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
83− target.requestedX = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth),
83+ target.windowedX = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.windowedWidth),
8484 (target.fullscreen ? 0 : root.leftMargin)); });
85− target.requestedY = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight); });
85+ target.windowedY = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.windowedHeight), PanelState.panelHeight); });
8686
8787 var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
8888 switch (windowState) {
@@ -124,28 +124,28 @@ MouseArea {
124124
125125 readonly property int minimumWidth: root.target ? Math.max(root.minWidth, root.target.minimumWidth) : root.minWidth
126126 onMinimumWidthChanged: {
127− if (target.requestedWidth < minimumWidth) {
128− target.requestedWidth = minimumWidth;
127+ if (target.windowedWidth < minimumWidth) {
128+ target.windowedWidth = minimumWidth;
129129 }
130130 }
131131 readonly property int minimumHeight: root.target ? Math.max(root.minHeight, root.target.minimumHeight) : root.minHeight
132132 onMinimumHeightChanged: {
133− if (target.requestedHeight < minimumHeight) {
134− target.requestedHeight = minimumHeight;
133+ if (target.windowedHeight < minimumHeight) {
134+ target.windowedHeight = minimumHeight;
135135 }
136136 }
137137 readonly property int maximumWidth: root.target && root.target.maximumWidth >= minimumWidth && root.target.maximumWidth > 0
138138 ? root.target.maximumWidth : maxSafeInt
139139 onMaximumWidthChanged: {
140− if (target.requestedWidth > maximumWidth) {
141− target.requestedWidth = maximumWidth;
140+ if (target.windowedWidth > maximumWidth) {
141+ target.windowedWidth = maximumWidth;
142142 }
143143 }
144144 readonly property int maximumHeight: root.target && root.target.maximumHeight >= minimumHeight && root.target.maximumHeight > 0
145145 ? root.target.maximumHeight : maxSafeInt
146146 onMaximumHeightChanged: {
147− if (target.requestedHeight > maximumHeight) {
148− target.requestedHeight = maximumHeight;
147+ if (target.windowedHeight > maximumHeight) {
148+ target.windowedHeight = maximumHeight;
149149 }
150150 }
151151 readonly property int widthIncrement: {
@@ -260,8 +260,8 @@ MouseArea {
260260 var pos = mapToItem(root.target.parent, mouseX, mouseY);
261261 d.startMousePosX = pos.x;
262262 d.startMousePosY = pos.y;
263− d.startX = target.requestedX;
264− d.startY = target.requestedY;
263+ d.startX = target.windowedX;
264+ d.startY = target.windowedY;
265265 d.startWidth = target.width;
266266 d.startHeight = target.height;
267267 d.currentWidth = target.width;
@@ -298,53 +298,53 @@ MouseArea {
298298
299299 if (d.leftBorder) {
300300 var newTargetX = d.startX + deltaX;
301− var rightBorderX = target.requestedX + target.width;
301+ var rightBorderX = target.windowedX + target.width;
302302 if (rightBorderX > newTargetX + d.minimumWidth) {
303303 if (rightBorderX < newTargetX + d.maximumWidth) {
304− target.requestedWidth = rightBorderX - newTargetX;
304+ target.windowedWidth = rightBorderX - newTargetX;
305305 } else {
306− target.requestedWidth = d.maximumWidth;
306+ target.windowedWidth = d.maximumWidth;
307307 }
308308 } else {
309− target.requestedWidth = d.minimumWidth;
309+ target.windowedWidth = d.minimumWidth;
310310 }
311311
312312 } else if (d.rightBorder) {
313313 var newWidth = d.startWidth + deltaX;
314314 if (newWidth > d.minimumWidth) {
315315 if (newWidth < d.maximumWidth) {
316− target.requestedWidth = newWidth;
316+ target.windowedWidth = newWidth;
317317 } else {
318− target.requestedWidth = d.maximumWidth;
318+ target.windowedWidth = d.maximumWidth;
319319 }
320320 } else {
321− target.requestedWidth = d.minimumWidth;
321+ target.windowedWidth = d.minimumWidth;
322322 }
323323 }
324324
325325 if (d.topBorder) {
326326 var newTargetY = Math.max(d.startY + deltaY, PanelState.panelHeight); // disallow resizing up past Panel
327− var bottomBorderY = target.requestedY + target.height;
327+ var bottomBorderY = target.windowedY + target.height;
328328 if (bottomBorderY > newTargetY + d.minimumHeight) {
329329 if (bottomBorderY < newTargetY + d.maximumHeight) {
330− target.requestedHeight = bottomBorderY - newTargetY;
330+ target.windowedHeight = bottomBorderY - newTargetY;
331331 } else {
332− target.requestedHeight = d.maximumHeight;
332+ target.windowedHeight = d.maximumHeight;
333333 }
334334 } else {
335− target.requestedHeight = d.minimumHeight;
335+ target.windowedHeight = d.minimumHeight;
336336 }
337337
338338 } else if (d.bottomBorder) {
339339 var newHeight = d.startHeight + deltaY;
340340 if (newHeight > d.minimumHeight) {
341341 if (newHeight < d.maximumHeight) {
342− target.requestedHeight = newHeight;
342+ target.windowedHeight = newHeight;
343343 } else {
344− target.requestedHeight = d.maximumHeight;
344+ target.windowedHeight = d.maximumHeight;
345345 }
346346 } else {
347− target.requestedHeight = d.minimumHeight;
347+ target.windowedHeight = d.minimumHeight;
348348 }
349349 }
350350 }
@@ -353,13 +353,13 @@ MouseArea {
353353 target: root.target
354354 onWidthChanged: {
355355 if (d.moveLeftBorder) {
356− target.requestedX += d.currentWidth - target.width;
356+ target.windowedX += d.currentWidth - target.width;
357357 }
358358 d.currentWidth = target.width;
359359 }
360360 onHeightChanged: {
361361 if (d.moveTopBorder) {
362− target.requestedY += d.currentHeight - target.height;
362+ target.windowedY += d.currentHeight - target.height;
363363 }
364364 d.currentHeight = target.height;
365365 }