[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/marble: probably bring back photo rendering
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2016-09-11 19:00:12
Message-ID: E1bj9zA-0004fF-MA () code ! kde ! org
[Download RAW message or body]

Git commit a2b74101acf6e89ece07830952938eed9751189d by Bernhard Beschow.
Committed on 11/09/2016 at 18:58.
Pushed by beschow into branch 'master'.

probably bring back photo rendering

M  +2    -0    src/lib/marble/StyleBuilder.cpp
M  +1    -1    src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp

http://commits.kde.org/marble/a2b74101acf6e89ece07830952938eed9751189d

diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index fb11ef4..247ae42 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -1557,6 +1557,8 @@ QStringList StyleBuilder::renderOrder() const
         paintLayerOrder << QStringLiteral("Polygon/Building/frame");
         paintLayerOrder << QStringLiteral("Polygon/Building/roof");
 
+        paintLayerOrder << QStringLiteral("Photo");
+
         Q_ASSERT(QSet<QString>::fromList(paintLayerOrder).size() == \
paintLayerOrder.size());  }
 
diff --git a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp \
b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp index 1d3c56a..a74f4b1 \
                100644
--- a/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoPhotoGraphicsItem.cpp
@@ -25,7 +25,7 @@ GeoPhotoGraphicsItem::GeoPhotoGraphicsItem( const GeoDataFeature \
*feature )  : GeoGraphicsItem( feature )
 {
     if (feature) {
-        QString const paintLayer = QLatin1String("Photo/") + \
StyleBuilder::visualCategoryName(feature->visualCategory()); +        QString const \
paintLayer = QStringLiteral("Photo");  setPaintLayers(QStringList() << paintLayer);
     }
 }


[prev in list] [next in list] [prev in thread] [next in thread]