From 467bcda16b0589a75d6b81d4b475a90cecae129d Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Wed, 25 Oct 2017 17:24:51 +0300
Subject: Consider map item color alpha channel when applying opacity

Task-number: QTBUG-63928
Change-Id: I8b09da92e182dc5464516842718b8d30bc9a48fc
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
---
 src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
index a4d3ed64..f39bfae3 100644
--- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
+++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange.cpp
@@ -384,7 +384,7 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     const QString id = getId(item);
 
     changes << QSharedPointer<QMapboxGLStyleChange>(
-        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->mapItemOpacity()));
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->color().alphaF() * item->mapItemOpacity()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
         new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-color"), item->color()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
@@ -401,7 +401,7 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     const QString id = getId(item);
 
     changes << QSharedPointer<QMapboxGLStyleChange>(
-        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->mapItemOpacity()));
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->color().alphaF() * item->mapItemOpacity()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
         new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-color"), item->color()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
@@ -418,7 +418,7 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     const QString id = getId(item);
 
     changes << QSharedPointer<QMapboxGLStyleChange>(
-        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->mapItemOpacity()));
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-opacity"), item->color().alphaF() * item->mapItemOpacity()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
         new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("fill-color"), item->color()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
@@ -435,7 +435,7 @@ QList<QSharedPointer<QMapboxGLStyleChange>> QMapboxGLStyleSetPaintProperty::from
     const QString id = getId(item);
 
     changes << QSharedPointer<QMapboxGLStyleChange>(
-        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("line-opacity"), item->mapItemOpacity()));
+        new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("line-opacity"), item->line()->color().alphaF() * item->mapItemOpacity()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
         new QMapboxGLStyleSetPaintProperty(id, QStringLiteral("line-color"), item->line()->color()));
     changes << QSharedPointer<QMapboxGLStyleChange>(
-- 
cgit v1.2.1