Merge pull request #8150 from highfidelity/vive-ui

merge vive-ui to master

interface/resources/qml/desktop/Desktop.qml

@@ -24,6 +24,13 @@ FocusScope {
     readonly property int invalid_position: -9999;
     property rect recommendedRect: Qt.rect(0,0,0,0);
     property var expectedChildren;
+    property bool repositionLocked: true
+
+    onRepositionLockedChanged: {
+        if (!repositionLocked) {
+            d.handleSizeChanged();
+        }
+    }
 
     onHeightChanged: d.handleSizeChanged();
     
@@ -52,11 +59,14 @@ FocusScope {
         readonly property real menu: 8000
     }
 
-
     QtObject {
         id: d
 
         function handleSizeChanged() {
+            if (desktop.repositionLocked) {
+                return;
+            }
+
             var oldRecommendedRect = recommendedRect;
             var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect();
             var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y, 
@@ -235,6 +245,10 @@ FocusScope {
         }
 
         function repositionAll() {
+            if (desktop.repositionLocked) {
+                return;
+            }
+
             var oldRecommendedRect = recommendedRect;
             var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
             var newRecommendedRect = Controller.getRecommendedOverlayRect();

interface/resources/qml/menus/MenuMouseHandler.qml

@@ -39,6 +39,19 @@ Item {
                 onSelected: d.handleSelection(subMenu, currentItem, item)
             }
         }
+        property var delay: Timer { // No setTimeout in QML.
+            property var menuItem: null;
+            interval: 0
+            repeat: false
+            running: false
+            function trigger(item) { // Capture item and schedule asynchronous Timer.
+                menuItem = item;
+                start();
+            }
+            onTriggered: {
+                menuItem.trigger(); // Now trigger the item.
+            }
+        }
 
         function toModel(items) {
             var result = modelMaker.createObject(desktop);
@@ -128,7 +141,8 @@ Item {
 
                 case MenuItemType.Item:
                     console.log("Triggering " + item.text)
-                    item.trigger();
+                    // Don't block waiting for modal dialogs and such that the menu might open.
+                    delay.trigger(item);
                     clearMenus();
                     break;
                 }

interface/src/Application.cpp

@@ -963,6 +963,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     updateHeartbeat();
 
     loadSettings();
+
+    // Now that we've loaded the menu and thus switched to the previous display plugin
+    // we can unlock the desktop repositioning code, since all the positions will be 
+    // relative to the desktop size for this plugin
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    offscreenUi->getDesktop()->setProperty("repositionLocked", false);
+
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -5343,7 +5350,6 @@ void Application::updateDisplayMode() {
         _displayPlugin = newDisplayPlugin;
     }
 
-
     emit activeDisplayPluginChanged();
 
     // reset the avatar, to set head and hand palms back to a reasonable default pose.