From 8a8aa7d937b4ba98f457f91c14c0779392b3724c Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Thu, 15 Sep 2011 20:15:53 +1000 Subject: fix context2d composition bug, lighter should map to qt ligten composite mode Change-Id: Iacc9cb4bd9196869b9947f919b7748ab5ad9610f Reviewed-on: http://codereview.qt-project.org/5039 Reviewed-by: Qt Sanity Bot Reviewed-by: Charles Yin --- src/declarative/items/context2d/qsgcontext2d.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index 6762c9160e..b5ccfa25ca 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -405,7 +405,7 @@ static QPainter::CompositionMode qt_composite_mode_from_string(const QString &co } else if (compositeOperator == QLatin1String("destination-over")) { return QPainter::CompositionMode_DestinationOver; } else if (compositeOperator == QLatin1String("lighter")) { - return QPainter::CompositionMode_Plus; + return QPainter::CompositionMode_Lighten; } else if (compositeOperator == QLatin1String("copy")) { return QPainter::CompositionMode_Source; } else if (compositeOperator == QLatin1String("xor")) { @@ -468,7 +468,7 @@ static QString qt_composite_mode_to_string(QPainter::CompositionMode op) case QPainter::CompositionMode_Xor: return QLatin1String("xor"); case QPainter::CompositionMode_Plus: - return QLatin1String("lighter"); + return QLatin1String("plus"); case QPainter::CompositionMode_Multiply: return QLatin1String("qt-multiply"); case QPainter::CompositionMode_Screen: @@ -478,7 +478,7 @@ static QString qt_composite_mode_to_string(QPainter::CompositionMode op) case QPainter::CompositionMode_Darken: return QLatin1String("qt-darken"); case QPainter::CompositionMode_Lighten: - return QLatin1String("qt-lighten"); + return QLatin1String("lighter"); case QPainter::CompositionMode_ColorDodge: return QLatin1String("qt-color-dodge"); case QPainter::CompositionMode_ColorBurn: -- cgit v1.2.3