From fa23e2023efdfb29cccbb3933c1bdaf78a03862d Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 23 Feb 2016 20:37:46 -0800
Subject: [PATCH] Fix bad tool window placement

---
 interface/resources/qml/ToolWindow.qml      | 6 ++++--
 interface/resources/qml/desktop/Desktop.qml | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml
index a7d45b9984..404d1c1e78 100644
--- a/interface/resources/qml/ToolWindow.qml
+++ b/interface/resources/qml/ToolWindow.qml
@@ -20,8 +20,10 @@ Windows.Window {
     property string newTabSource
     property alias tabView: tabView
     onParentChanged: {
-        x = 120;
-        y = 120;
+        if (parent) {
+            x = 120;
+            y = 120;
+        }
     }
 
     Settings {
diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 604d57d3da..fcc0f9967b 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -11,10 +11,7 @@ import "../js/Utils.js" as Utils
 FocusScope {
     id: desktop
     objectName: "desktop"
-
-    // Allow the scale of the desktop to be changed without screwing up the size relative to the parent.
-    height: parent.height / scale
-    width: parent.width / scale
+    anchors.fill: parent
 
     onHeightChanged: d.repositionAll();
     onWidthChanged: d.repositionAll();