Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 13:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed a bunch of dead code

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-04-26 09:25:28 -07:00
parent 4ab7b660d4
commit 716d9e554c
4 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/InfoView.qml
View file

@ -24,11 +24,9 @@ Windows.Window {
}
Component.onCompleted: {
//console.log("InfoView.Component.onCompleted");
centerWindow(root);
}
onVisibleChanged: {
if (visible) {
centerWindow(root);
@ -36,7 +34,6 @@ Windows.Window {
}
function centerWindow() {
//console.log("InfoView.Component.centerWindow");
desktop.centerOnVisible(root);
}

28
interface/resources/qml/desktop/Desktop.qml
View file

@ -63,21 +63,12 @@ FocusScope {
var oldChildren = expectedChildren;
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)
&& (oldRecommendedRect != newRecommendedRect
|| oldChildren != newChildren)
) {
expectedChildren = newChildren;
//console.log("handleSizeChanged() - calling repositionAll()");
d.repositionAll();
} else {
//console.log("handleSizeChanged() - DID NOT CALL repositionAll()");
}
recommendedRect = newRecommendedRect;
}
@ -259,7 +250,6 @@ FocusScope {
for (var i = 0; i < windows.length; ++i) {
var targetWindow = windows[i];
if (targetWindow.visible) {
//console.log("repositionAll() about to repositionWindow() targetWindow:" + targetWindow);
repositionWindow(targetWindow, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
}
}
@ -268,7 +258,6 @@ FocusScope {
var otherChildren = d.getRepositionChildren();
for (var i = 0; i < otherChildren.length; ++i) {
var child = otherChildren[i];
//console.log("repositionAll() about to repositionWindow() child:" + child);
repositionWindow(child, true, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
}
@ -300,9 +289,7 @@ FocusScope {
}
function centerOnVisible(item) {
//console.log("centerOnVisible() item:" + item);
var targetWindow = d.getDesktopWindow(item);
//console.log("centerOnVisible() targetWindow:" + targetWindow );
if (!targetWindow) {
console.warn("Could not find top level window for " + item);
return;
@ -320,17 +307,11 @@ FocusScope {
var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
var newX = newRecommendedRect.x + ((newRecommendedRect.width - targetWindow.width) / 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.y = newY;
// If we've noticed that our recommended desktop rect has changed, record that change here.
if (recommendedRect != newRecommendedRect) {
//console.log("centerOnVisible() -- detected new recommended rect");
//console.log("old recommendedRect:" + recommendedRect);
//console.log("newRecommendedRect:" + newRecommendedRect);
recommendedRect = newRecommendedRect;
}
@ -396,13 +377,6 @@ FocusScope {
var fractionY = Utils.clamp(originRelativeY / oldRecommendedDimmensions.y, 0, 1);
var newX = (fractionX * newRecommendedDimmensions.x) + newRecommendedRect.x;
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);
}
targetWindow.x = newPosition.x;

1
interface/resources/qml/windows-uit/Window.qml
View file

@ -249,7 +249,6 @@ Fadable {
children: [ swallower, frame, pane, activator ]
Component.onCompleted: {
//console.log("Window(uit).Component.onCompleted window:" + window);
window.parentChanged.connect(raise);
raise();
setDefaultFocus();

1
interface/resources/qml/windows/Window.qml
View file

@ -115,7 +115,6 @@ Fadable {
children: [ swallower, frame, content, activator ]
Component.onCompleted: {
//console.log("Window(uit).Component.onCompleted window:" + window);
window.parentChanged.connect(raise);
raise();
centerOrReposition();