Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear)

Browse source 
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
This commit is contained in:
Alexander Ivash 2018-04-06 02:51:22 +03:00
parent 3bc764a020
commit 557b7ded66
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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