From 46ed5f6479c31937d5f0a62ae763fe18b255aedd Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Sat, 9 Jan 2016 14:27:57 -0800 Subject: [PATCH 1/3] Fix AssignmentParentFinder not handling null parentID --- assignment-client/src/entities/AssignmentParentFinder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assignment-client/src/entities/AssignmentParentFinder.cpp b/assignment-client/src/entities/AssignmentParentFinder.cpp index cc5c7557dc..294556383e 100644 --- a/assignment-client/src/entities/AssignmentParentFinder.cpp +++ b/assignment-client/src/entities/AssignmentParentFinder.cpp @@ -13,6 +13,12 @@ SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool& success) const { SpatiallyNestableWeakPointer parent; + + if (parentID.isNull()) { + success = true; + return parent; + } + // search entities parent = _tree->findEntityByEntityItemID(parentID); if (parent.expired()) { From d74686474a08ddf980d8c9bab6bc6a200760a00b Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 10 Jan 2016 11:39:47 -0800 Subject: [PATCH 2/3] Ensure VR menus never render off the overlay --- interface/resources/qml/VrMenu.qml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/interface/resources/qml/VrMenu.qml b/interface/resources/qml/VrMenu.qml index 738ec34a02..689171f9e9 100644 --- a/interface/resources/qml/VrMenu.qml +++ b/interface/resources/qml/VrMenu.qml @@ -51,6 +51,16 @@ Hifi.VrMenu { VrMenuView { property int menuDepth: root.models.length - 1 model: root.models[menuDepth] + + function fit(position, size, maxposition) { + var padding = 8; + if (position < padding) { + position = padding; + } else if (position + size + padding > maxposition) { + position = maxposition - (size + padding); + } + return position; + } Component.onCompleted: { if (menuDepth === 0) { @@ -61,6 +71,8 @@ Hifi.VrMenu { x = lastColumn.x + 64; y = lastMousePosition.y - height / 2; } + x = fit(x, width, parent.width); + y = fit(y, height, parent.height); } onSelected: { From 9068d559988af9e6c47a0cd2ef3441d21b208517 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 11 Jan 2016 15:58:00 +1300 Subject: [PATCH 3/3] Fix display of File > About Interface window --- interface/resources/html/interface-welcome.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/html/interface-welcome.html b/interface/resources/html/interface-welcome.html index 1fc719ed72..113de7f2a0 100644 --- a/interface/resources/html/interface-welcome.html +++ b/interface/resources/html/interface-welcome.html @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ body { background: white; - width: 839px; + width: 100%; overflow-x: hidden; } @@ -181,7 +181,7 @@ function overrideBodyWidth() { document.body.style.width = "100%"; - container.style.width = "0"; + } //]]>