diff --git a/interface/resources/qml/InteractiveWindow.qml b/interface/resources/qml/InteractiveWindow.qml index 3741db74c1..3a4ec8838c 100644 --- a/interface/resources/qml/InteractiveWindow.qml +++ b/interface/resources/qml/InteractiveWindow.qml @@ -68,13 +68,11 @@ Windows.Window { Timer { id: timer - } - - function delay(delayTimeMS, delayFunction) { - timer.interval = delayTimeMS; - timer.repeat = false; - timer.triggered.connect(delayFunction); - timer.start(); + interval: 500; + repeat: false; + onTriggered: { + updateContentParent(); + } } function updateInteractiveWindowPositionForMode() { @@ -146,10 +144,10 @@ Windows.Window { id: root; width: interactiveWindowSize.width height: interactiveWindowSize.height + // fix for missing content on OSX initial startup with a non-maximized interface window. It seems that in this case, we cannot update + // the content parent during creation of the Window root. This added delay will update the parent after the root has finished loading. Component.onCompleted: { - delay(500, function() { - updateContentParent(); - }); + timer.start(); } Rectangle { diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js index e0ef9aaf5d..d7d6279e10 100644 --- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js +++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js @@ -798,4 +798,4 @@ function toggleEmojiApp() { var emote = setup(); -module.exports = emote; +module.exports = emote; \ No newline at end of file diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml index 674966c228..bbd1d4d735 100644 --- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml +++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml @@ -1,4 +1,4 @@ -// +// // SimplifiedEmoteIndicator.qml // // Created by Milad Nazeri on 2019-08-05