mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 13:58:51 +02:00
removed a bunch of dead code
This commit is contained in:
parent
4ab7b660d4
commit
716d9e554c
4 changed files with 1 additions and 32 deletions
|
@ -24,11 +24,9 @@ Windows.Window {
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
//console.log("InfoView.Component.onCompleted");
|
|
||||||
centerWindow(root);
|
centerWindow(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
onVisibleChanged: {
|
onVisibleChanged: {
|
||||||
if (visible) {
|
if (visible) {
|
||||||
centerWindow(root);
|
centerWindow(root);
|
||||||
|
@ -36,7 +34,6 @@ Windows.Window {
|
||||||
}
|
}
|
||||||
|
|
||||||
function centerWindow() {
|
function centerWindow() {
|
||||||
//console.log("InfoView.Component.centerWindow");
|
|
||||||
desktop.centerOnVisible(root);
|
desktop.centerOnVisible(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,21 +63,12 @@ FocusScope {
|
||||||
|
|
||||||
var oldChildren = expectedChildren;
|
var oldChildren = expectedChildren;
|
||||||
var newChildren = d.getRepositionChildren();
|
var newChildren = d.getRepositionChildren();
|
||||||
|
|
||||||
//console.log("handleSizeChanged() - oldChildren:" + oldChildren);
|
|
||||||
//console.log("handleSizeChanged() - newChildren:" + newChildren);
|
|
||||||
//console.log("handleSizeChanged() - oldRecommendedRect:" + oldRecommendedRect);
|
|
||||||
//console.log("handleSizeChanged() - newRecommendedRect:" + newRecommendedRect);
|
|
||||||
|
|
||||||
if (oldRecommendedRect != Qt.rect(0,0,0,0)
|
if (oldRecommendedRect != Qt.rect(0,0,0,0)
|
||||||
&& (oldRecommendedRect != newRecommendedRect
|
&& (oldRecommendedRect != newRecommendedRect
|
||||||
|| oldChildren != newChildren)
|
|| oldChildren != newChildren)
|
||||||
) {
|
) {
|
||||||
expectedChildren = newChildren;
|
expectedChildren = newChildren;
|
||||||
//console.log("handleSizeChanged() - calling repositionAll()");
|
|
||||||
d.repositionAll();
|
d.repositionAll();
|
||||||
} else {
|
|
||||||
//console.log("handleSizeChanged() - DID NOT CALL repositionAll()");
|
|
||||||
}
|
}
|
||||||
recommendedRect = newRecommendedRect;
|
recommendedRect = newRecommendedRect;
|
||||||
}
|
}
|
||||||
|
@ -259,7 +250,6 @@ FocusScope {
|
||||||
for (var i = 0; i < windows.length; ++i) {
|
for (var i = 0; i < windows.length; ++i) {
|
||||||
var targetWindow = windows[i];
|
var targetWindow = windows[i];
|
||||||
if (targetWindow.visible) {
|
if (targetWindow.visible) {
|
||||||
//console.log("repositionAll() about to repositionWindow() targetWindow:" + targetWindow);
|
|
||||||
repositionWindow(targetWindow, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
|
repositionWindow(targetWindow, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -268,7 +258,6 @@ FocusScope {
|
||||||
var otherChildren = d.getRepositionChildren();
|
var otherChildren = d.getRepositionChildren();
|
||||||
for (var i = 0; i < otherChildren.length; ++i) {
|
for (var i = 0; i < otherChildren.length; ++i) {
|
||||||
var child = otherChildren[i];
|
var child = otherChildren[i];
|
||||||
//console.log("repositionAll() about to repositionWindow() child:" + child);
|
|
||||||
repositionWindow(child, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
|
repositionWindow(child, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -300,9 +289,7 @@ FocusScope {
|
||||||
}
|
}
|
||||||
|
|
||||||
function centerOnVisible(item) {
|
function centerOnVisible(item) {
|
||||||
//console.log("centerOnVisible() item:" + item);
|
|
||||||
var targetWindow = d.getDesktopWindow(item);
|
var targetWindow = d.getDesktopWindow(item);
|
||||||
//console.log("centerOnVisible() targetWindow:" + targetWindow );
|
|
||||||
if (!targetWindow) {
|
if (!targetWindow) {
|
||||||
console.warn("Could not find top level window for " + item);
|
console.warn("Could not find top level window for " + item);
|
||||||
return;
|
return;
|
||||||
|
@ -320,17 +307,11 @@ FocusScope {
|
||||||
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
|
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
|
||||||
var newX = newRecommendedRect.x + ((newRecommendedRect.width - targetWindow.width) / 2);
|
var newX = newRecommendedRect.x + ((newRecommendedRect.width - targetWindow.width) / 2);
|
||||||
var newY = newRecommendedRect.y + ((newRecommendedRect.height - targetWindow.height) / 2);
|
var newY = newRecommendedRect.y + ((newRecommendedRect.height - targetWindow.height) / 2);
|
||||||
|
|
||||||
//console.log("centerOnVisible() newRecommendedRect:" + newRecommendedRect.x + "," + newRecommendedRect.y + "/" + newRecommendedRect.width + "x" + newRecommendedRect.height);
|
|
||||||
//console.log("centerOnVisible() newX/newY:" + newX + "," + newY);
|
|
||||||
|
|
||||||
targetWindow.x = newX;
|
targetWindow.x = newX;
|
||||||
targetWindow.y = newY;
|
targetWindow.y = newY;
|
||||||
|
|
||||||
|
// If we've noticed that our recommended desktop rect has changed, record that change here.
|
||||||
if (recommendedRect != newRecommendedRect) {
|
if (recommendedRect != newRecommendedRect) {
|
||||||
//console.log("centerOnVisible() -- detected new recommended rect");
|
|
||||||
//console.log("old recommendedRect:" + recommendedRect);
|
|
||||||
//console.log("newRecommendedRect:" + newRecommendedRect);
|
|
||||||
recommendedRect = newRecommendedRect;
|
recommendedRect = newRecommendedRect;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -396,13 +377,6 @@ FocusScope {
|
||||||
var fractionY = Utils.clamp(originRelativeY / oldRecommendedDimmensions.y, 0, 1);
|
var fractionY = Utils.clamp(originRelativeY / oldRecommendedDimmensions.y, 0, 1);
|
||||||
var newX = (fractionX * newRecommendedDimmensions.x) + newRecommendedRect.x;
|
var newX = (fractionX * newRecommendedDimmensions.x) + newRecommendedRect.x;
|
||||||
var newY = (fractionY * newRecommendedDimmensions.y) + newRecommendedRect.y;
|
var newY = (fractionY * newRecommendedDimmensions.y) + newRecommendedRect.y;
|
||||||
|
|
||||||
//console.log("repositionWindow() oldRecommendedRect:" + oldRecommendedRect.x + "," + oldRecommendedRect.y + "/" + oldRecommendedRect.width + "x" + oldRecommendedRect.height);
|
|
||||||
//console.log("repositionWindow() newRecommendedRect:" + newRecommendedRect.x + "," + newRecommendedRect.y + "/" + newRecommendedRect.width + "x" + newRecommendedRect.height);
|
|
||||||
//console.log("repositionWindow() originRelativeX/originRelativeY:" + originRelativeX + "," + originRelativeY);
|
|
||||||
//console.log("repositionWindow() fractionX/fractionY:" + fractionX + "," + fractionY);
|
|
||||||
//console.log("repositionWindow() newX/newY:" + newX + "," + newY);
|
|
||||||
|
|
||||||
newPosition = Qt.vector2d(newX, newY);
|
newPosition = Qt.vector2d(newX, newY);
|
||||||
}
|
}
|
||||||
targetWindow.x = newPosition.x;
|
targetWindow.x = newPosition.x;
|
||||||
|
|
|
@ -249,7 +249,6 @@ Fadable {
|
||||||
children: [ swallower, frame, pane, activator ]
|
children: [ swallower, frame, pane, activator ]
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
//console.log("Window(uit).Component.onCompleted window:" + window);
|
|
||||||
window.parentChanged.connect(raise);
|
window.parentChanged.connect(raise);
|
||||||
raise();
|
raise();
|
||||||
setDefaultFocus();
|
setDefaultFocus();
|
||||||
|
|
|
@ -115,7 +115,6 @@ Fadable {
|
||||||
children: [ swallower, frame, content, activator ]
|
children: [ swallower, frame, content, activator ]
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
//console.log("Window(uit).Component.onCompleted window:" + window);
|
|
||||||
window.parentChanged.connect(raise);
|
window.parentChanged.connect(raise);
|
||||||
raise();
|
raise();
|
||||||
centerOrReposition();
|
centerOrReposition();
|
||||||
|
|
Loading…
Reference in a new issue