From 716d9e554c90802d622a7ae3f70e309fbb7d9c57 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Tue, 26 Apr 2016 09:25:28 -0700
Subject: [PATCH] removed a bunch of dead code

---
 interface/resources/qml/InfoView.qml          |  3 --
 interface/resources/qml/desktop/Desktop.qml   | 28 +------------------
 .../resources/qml/windows-uit/Window.qml      |  1 -
 interface/resources/qml/windows/Window.qml    |  1 -
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml
index 025cc6cc59..2e93c401d4 100644
--- a/interface/resources/qml/InfoView.qml
+++ b/interface/resources/qml/InfoView.qml
@@ -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);
     }
 
diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 2a2c6b5d24..f24f822f49 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -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;
diff --git a/interface/resources/qml/windows-uit/Window.qml b/interface/resources/qml/windows-uit/Window.qml
index 59d5dcd70e..db286ca44e 100644
--- a/interface/resources/qml/windows-uit/Window.qml
+++ b/interface/resources/qml/windows-uit/Window.qml
@@ -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();
diff --git a/interface/resources/qml/windows/Window.qml b/interface/resources/qml/windows/Window.qml
index c24f4a3b9b..4d6b3a2f23 100644
--- a/interface/resources/qml/windows/Window.qml
+++ b/interface/resources/qml/windows/Window.qml
@@ -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();