Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 19:34:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the recursive launching of load script from URL

Browse source
This commit is contained in:
Brad Davis 2016-01-26 16:48:25 -08:00
parent 462758ebdd
commit 8dc066fc00
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/desktop/Desktop.qml
View file

@ -167,7 +167,7 @@ FocusScope {
}
if (setFocus) {
focus = true;
targetWindow.focus = true;
}
reposition(targetWindow);

21
interface/resources/qml/dialogs/RunningScripts.qml
View file

@ -184,9 +184,28 @@ Window {
anchors.bottom: filterEdit.top
anchors.bottomMargin: 8
anchors.right: parent.right
// For some reason trigginer an API that enters
// an internal event loop directly from the button clicked
// trigger below causes the appliction to behave oddly.
// Most likely because the button onClicked handling is never
// completed until the function returns.
// FIXME find a better way of handling the input dialogs that
// doesn't trigger this.
Timer {
id: asyncAction
interval: 50
repeat: false
running: false
onTriggered: ApplicationInterface.loadScriptURLDialog();
}
Button {
text: "from URL";
onClicked: ApplicationInterface.loadScriptURLDialog();
onClicked: {
focus = false;
asyncAction.running = true;
}
}
Button {
text: "from Disk"