diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-08-06 10:18:24 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-02 06:32:03 (GMT) |
| commit | 592106653272bae16d80accdf71db7def49a6615 (patch) | |
| tree | 02186fbb9f4866c5e9fe6177afdd1b215b87f00f | |
| parent | e4c29c1e0fbcff17108af67bd2444cd82af9975a (diff) | |
| download | Qt-592106653272bae16d80accdf71db7def49a6615.zip Qt-592106653272bae16d80accdf71db7def49a6615.tar.gz Qt-592106653272bae16d80accdf71db7def49a6615.tar.bz2 | |
Use ARGB32 premultiplied backing store format in Symbian^3
raster paint engine for translucent windows.
Task-number: QTBUG-12710
Reviewed-by: Jason Barron
(cherry picked from commit 0210bbbd7bf8254be5f7f19f524068cd39fc34c2)
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_s60.cpp | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 52f0db6..a14b1a7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1087,7 +1087,8 @@ void QSymbianControl::Draw(const TRect& controlRect) const break; case QWExtra::ZeroFill: - if (Window().DisplayMode() == EColor16MA) { + if (Window().DisplayMode() == EColor16MA + || Window().DisplayMode() == Q_SYMBIAN_ECOLOR16MAP) { gc.SetBrushStyle(CGraphicsContext::ESolidBrush); gc.SetDrawMode(CGraphicsContext::EDrawModeWriteAlpha); gc.SetBrushColor(TRgb::Color16MA(0)); diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index 477bd93..8bac1f5 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -67,10 +67,14 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget) TDisplayMode mode = S60->screenDevice()->DisplayMode(); bool isOpaque = qt_widget_private(widget)->isOpaque; - if (mode == EColor16MA && isOpaque) - mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated - else if (mode == EColor16MU && !isOpaque) - mode = EColor16MA; // Try for transparency anyway + if (isOpaque) { + mode = EColor16MU; + } else { + if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3) + mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 WServ has support for ARGB32_PRE + else + mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA + } // We create empty CFbsBitmap here -> it will be resized in setGeometry CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap); // CBase derived object needs check on new |