diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 11:46:57 +0100 |
commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/gui/kernel/qt_s60_p.h | |
parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
-rw-r--r-- | src/gui/kernel/qt_s60_p.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 789d89e385..3405bcfe76 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -73,6 +73,7 @@ #include <akntitle.h> // CAknTitlePane #include <akncontext.h> // CAknContextPane #include <eikspane.h> // CEikStatusPane +#include <aknpopupfader.h> // MAknFadedComponent and TAknPopupFader #endif QT_BEGIN_NAMESPACE @@ -114,7 +115,7 @@ public: int supportsPremultipliedAlpha : 1; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type static inline void updateScreenSize(); - static inline RWsSession& wsSession(); + static inline RWsSession& wsSession(); static inline RWindowGroup& windowGroup(); static inline CWsScreenDevice* screenDevice(); static inline CCoeAppUi* appUi(); @@ -140,7 +141,11 @@ public: }; class QLongTapTimer; + class QSymbianControl : public CCoeControl, public QAbstractLongTapObserver +#ifdef Q_WS_S60 +, public MAknFadedComponent +#endif { public: DECLARE_TYPE_ID(0x51740000) // Fun fact: the two first values are "Qt" in ASCII. @@ -165,6 +170,17 @@ public: void setFocusSafely(bool focus); +#ifdef Q_WS_S60 + void FadeBehindPopup(bool fade){ popupFader.FadeBehindPopup( this, this, fade); } + +protected: // from MAknFadedComponent + TInt CountFadedComponents() {return 1;} + CCoeControl* FadedComponent(TInt aIndex) {return this;} +#else + #warning No fallback implementation for QSymbianControl::FadeBehindPopup + void FadeBehindPopup(bool /*fade*/){ } +#endif + protected: void Draw(const TRect& aRect) const; void SizeChanged(); @@ -189,6 +205,11 @@ private: bool m_ignoreFocusChanged; QLongTapTimer* m_longTapDetector; bool m_previousEventLongTap; + +#ifdef Q_WS_S60 + // Fader object used to fade everything except this menu and the CBA. + TAknPopupFader popupFader; +#endif }; inline QS60Data::QS60Data() |