diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 18:52:28 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 20:27:00 +0200 |
commit | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (patch) | |
tree | c1c4ac6daa87042196fa66a92ea56737930c0920 /src/quicktemplates2/qquickpopup_p_p.h | |
parent | 9a55b34e292c725a4fa394a71e0a3d851e4e488f (diff) | |
parent | 9ae57848671419b2622e254af8642fef7b1b7c33 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickpopup_p_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 4478c555..93039287 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -76,11 +76,6 @@ protected: void finished() override; private: - enum TransitionState { - Off, Enter, Exit - }; - - TransitionState state; QQuickPopupPrivate *popup; }; @@ -163,10 +158,10 @@ public: bool tryClose(QQuickItem *item, QMouseEvent *event); virtual void reposition(); - virtual void prepareEnterTransition(bool notify = true); - virtual void prepareExitTransition(); + virtual bool prepareEnterTransition(); + virtual bool prepareExitTransition(); virtual void finalizeEnterTransition(); - virtual void finalizeExitTransition(bool hide = true); + virtual void finalizeExitTransition(); QMarginsF getMargins() const; @@ -178,6 +173,10 @@ public: void setWindow(QQuickWindow *window); void itemDestroyed(QQuickItem *item) override; + enum TransitionState { + NoTransition, EnterTransition, ExitTransition + }; + bool focus; bool modal; bool dim; @@ -202,6 +201,7 @@ public: qreal bottomMargin; qreal contentWidth; qreal contentHeight; + TransitionState transitionState; QQuickPopup::ClosePolicy closePolicy; QQuickItem *parentItem; QQuickItem *dimmer; |