Fix for symbian dialog background transparency.

If Avkon components support transparency then dialog background is transparent
enabling rounded corners.

Reviewed-by: Sami Merila

2 files changed, 39 insertions, 0 deletions

diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index b417065..2c733b9 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -74,6 +74,7 @@
 #include <akncontext.h>             // CAknContextPane
 #include <eikspane.h>               // CEikStatusPane
 #include <aknpopupfader.h>          // MAknFadedComponent and TAknPopupFader
+#include <centralrepository.h>
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -133,8 +134,14 @@ 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
 };
 
@@ -305,6 +312,30 @@ 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)
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 81a9a80..542da5e 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2026,6 +2026,14 @@ void QWidgetPrivate::updateIsOpaque()
     }
 #endif
 
+#ifdef Q_WS_S60
+    if (q->windowType() == Qt::Dialog && q->testAttribute(Qt::WA_TranslucentBackground)
+                && S60->avkonComponentsSupportTransparency()) {
+        setOpaque(false);
+        return;
+    }
+#endif
+
     if (q->testAttribute(Qt::WA_OpaquePaintEvent) || q->testAttribute(Qt::WA_PaintOnScreen)) {
         setOpaque(true);
         return;