summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-12-21 15:14:09 -0500
committerAnsis Brammanis <brammanis@gmail.com>2016-01-06 15:17:03 -0800
commit1dd1543905d70971009d333c42548dde6e2ad253 (patch)
tree52919abaaa5729f8a9b74e0e9e39b2b902774b03 /src
parentdc1630f50d1a3493acd2afe42aa2b8dd2e8876fb (diff)
downloadqtlocation-mapboxgl-1dd1543905d70971009d333c42548dde6e2ad253.tar.gz
[core] clip labels to tiles in MapMode::Still
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/painter_symbol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index 5316499131..43cd3d5405 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -153,8 +153,8 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const
}
// TODO remove the `true ||` when #1673 is implemented
- const bool drawAcrossEdges = true || !(layout.text.allowOverlap || layout.icon.allowOverlap ||
- layout.text.ignorePlacement || layout.icon.ignorePlacement);
+ const bool drawAcrossEdges = (data.mode == MapMode::Continuous) && (true || !(layout.text.allowOverlap || layout.icon.allowOverlap ||
+ layout.text.ignorePlacement || layout.icon.ignorePlacement));
// Disable the stencil test so that labels aren't clipped to tile boundaries.
//