aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-19 22:58:43 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-19 22:04:58 +0000
commit74c00af27c381fd56b5f81c7e52a3cba9a4030f4 (patch)
tree6554485272c6ba9cf0db2ff0f5da62232a66ca21 /src
parent1a65814fdc08ba134db422c1c3fb214a1857d30d (diff)
Allow closing an opening popup
Change-Id: I4937808275c138fca09fa866b5df4d54d084357d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/templates/qquickpopup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index 2da468d0..2e826591 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -92,7 +92,7 @@ QQuickPopupTransitionManager::QQuickPopupTransitionManager(QQuickPopupPrivate *p
void QQuickPopupTransitionManager::transitionEnter()
{
- if (isRunning())
+ if (state == Enter && isRunning())
return;
QList<QQuickStateAction> actions;
state = Enter;
@@ -101,7 +101,7 @@ void QQuickPopupTransitionManager::transitionEnter()
void QQuickPopupTransitionManager::transitionExit()
{
- if (isRunning())
+ if (state == Exit && isRunning())
return;
QList<QQuickStateAction> actions;
state = Exit;