tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Trigger Update::RecalculateStyle when toggling layer visibility

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2016-09-24 12:32:23 +03:00
parent ae3a02babe
commit 2ed81bbaae
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/style/style.cpp
View File

@@ -520,7 +520,7 @@ void Style::onLayerFilterChanged(Layer& layer) {
void Style::onLayerVisibilityChanged(Layer& layer) {
layer.accept(QueueSourceReloadVisitor { updateBatch });
observer->onUpdate(Update::Layout);
observer->onUpdate(Update::RecalculateStyle | Update::Layout);
}
void Style::onLayerPaintPropertyChanged(Layer&) {

17
test/style/style.cpp
View File

@@ -3,6 +3,7 @@
#include <mbgl/style/style.hpp>
#include <mbgl/style/source_impl.hpp>
#include <mbgl/style/layer.hpp>
#include <mbgl/util/io.hpp>
#include <mbgl/util/run_loop.hpp>
@@ -25,13 +26,25 @@ TEST(Style, UnusedSource) {
style.cascade(now, MapMode::Still);
style.recalculate(0, now, MapMode::Still);
Source *usedSource = style.getSource("usedsource");
Source* usedSource = style.getSource("usedsource");
EXPECT_TRUE(usedSource);
EXPECT_TRUE(usedSource->baseImpl->isLoaded());
Source *unusedSource = style.getSource("unusedsource");
Source* unusedSource = style.getSource("unusedsource");
EXPECT_TRUE(unusedSource);
EXPECT_FALSE(unusedSource->baseImpl->isLoaded());
Layer* unusedLayer = style.getLayer("unusedlayervisibility");
EXPECT_TRUE(unusedLayer);
unusedLayer->setVisibility(mbgl::style::VisibilityType::Visible);
style.relayout();
EXPECT_FALSE(unusedSource->baseImpl->isLoaded());
// Style loads sources upon request when recalculating style.
style.recalculate(0, now, MapMode::Still);
EXPECT_TRUE(unusedSource->baseImpl->isLoaded());
}
TEST(Style, UnusedSourceActiveViaClassUpdate) {