Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:12:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Feedback changes

Browse source
This commit is contained in:
Rebecca Stankus 2019-10-24 10:24:18 -07:00
parent f8102be74d
commit 9a8fda2705
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/resources/qml/InteractiveWindow.qml
View file

@ -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 {

2
scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
View file

@ -798,4 +798,4 @@ function toggleEmojiApp() {
var emote = setup();
module.exports = emote;
module.exports = emote;

2
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -1,4 +1,4 @@
//
//
// SimplifiedEmoteIndicator.qml
//
// Created by Milad Nazeri on 2019-08-05