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

Merge pull request from ElderOrb/FB13962_RC66

Browse source 
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
This commit is contained in:
John Conklin II 2018-04-09 09:42:00 -07:00 committed by GitHub
commit be3d5d03cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
interface/resources/qml
dialogs
CustomQueryDialog.qmlQueryDialog.qml
windows
Fadable.qml

4
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -272,6 +272,8 @@ ModalWindow {
root.canceled();
// FIXME we are leaking memory to avoid a crash
// root.destroy();
root.disableFade = true
visible = false;
}
}
@ -296,6 +298,8 @@ ModalWindow {
root.selected(root.result);
// FIXME we are leaking memory to avoid a crash
// root.destroy();
root.disableFade = true
visible = false;
}
}

4
interface/resources/qml/dialogs/QueryDialog.qml
View file

@ -171,6 +171,8 @@ ModalWindow {
root.canceled();
// FIXME we are leaking memory to avoid a crash
// root.destroy();
root.disableFade = true
visible = false;
}
}
@ -183,6 +185,8 @@ ModalWindow {
root.selected(root.result);
// FIXME we are leaking memory to avoid a crash
// root.destroy();
root.disableFade = true
visible = false;
}
}

2
interface/resources/qml/windows/Fadable.qml
View file

@ -39,7 +39,7 @@ FocusScope {
// If someone directly set the visibility to false
// toggle it back on and use the targetVisible flag to transition
// via fading.
if ((!visible && fadeTargetProperty != 0.0) || (visible && fadeTargetProperty == 0.0)) {
if (!disableFade && ((!visible && fadeTargetProperty != 0.0) || (visible && fadeTargetProperty == 0.0))) {
var target = visible;
visible = !visible;
fadeTargetProperty = target ? 1.0 : 0.0;