diff options
author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-01-22 12:00:11 (GMT) |
---|---|---|
committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-01-22 12:00:11 (GMT) |
commit | 8e87feefc0a92fbbeb1846f2471cdded9ef901ff (patch) | |
tree | 75bded8a8d3c2288739451d65a843899a7ff18dd /src/gui/kernel/qt_s60_p.h | |
parent | b22b06debf9d7e964244a0a613354be0ea9e07b7 (diff) | |
download | Qt-8e87feefc0a92fbbeb1846f2471cdded9ef901ff.zip Qt-8e87feefc0a92fbbeb1846f2471cdded9ef901ff.tar.gz Qt-8e87feefc0a92fbbeb1846f2471cdded9ef901ff.tar.bz2 |
Move avkon component transparency check to app initialization.
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
-rw-r--r-- | src/gui/kernel/qt_s60_p.h | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 2c733b9..1163055 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -74,7 +74,6 @@ #include <akncontext.h> // CAknContextPane #include <eikspane.h> // CEikStatusPane #include <aknpopupfader.h> // MAknFadedComponent and TAknPopupFader -#include <centralrepository.h> #endif QT_BEGIN_NAMESPACE @@ -122,6 +121,7 @@ public: int virtualMouseRequired : 1; int qtOwnsS60Environment : 1; int supportsPremultipliedAlpha : 1; + int avkonComponentsSupportTransparency : 1; QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type static inline void updateScreenSize(); static inline RWsSession& wsSession(); @@ -134,14 +134,8 @@ public: static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); - static inline bool avkonComponentsSupportTransparency(); TTrapHandler *s60InstalledTrapHandler; - -private: - - bool transparencyChecked; - bool transparencyEnabled; #endif }; @@ -312,30 +306,6 @@ inline CEikButtonGroupContainer* QS60Data::buttonGroupContainer() { return CEikonEnv::Static()->AppUiFactory()->Cba(); } - -inline bool QS60Data::avkonComponentsSupportTransparency() -{ - if(!S60->transparencyChecked) { - S60->transparencyChecked = true; - S60->transparencyEnabled = false; - - TUid KCRUidAvkon = { 0x101F876E }; - TUint32 KAknAvkonTransparencyEnabled = 0x0000000D; - - CRepository* repository = 0; - TRAPD(err, repository = CRepository::NewL(KCRUidAvkon)); - - if(err == KErrNone) { - TInt value = 0; - err = repository->Get(KAknAvkonTransparencyEnabled, value); - if(err == KErrNone) { - S60->transparencyEnabled = (value==1) ? true : false; - } - } - } - - return S60->transparencyEnabled; -} #endif // Q_WS_S60 static inline QFont qt_TFontSpec2QFontL(const TFontSpec &fontSpec) |