diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-26 15:24:16 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-10-17 10:44:38 -0700 |
| commit | 4603ca037cab2d0f732285ce9e006744ad3118d6 (patch) | |
| tree | 0c14ef89bfc59a4501f63fb34e89bfc8ce6ccb01 /src/style | |
| parent | 48a310406621957db4154e844d28e98f460a0226 (diff) | |
| download | qtlocation-mapboxgl-4603ca037cab2d0f732285ce9e006744ad3118d6.tar.gz | |
background-image support
Diffstat (limited to 'src/style')
| -rw-r--r-- | src/style/style_layer.cpp | 1 | ||||
| -rw-r--r-- | src/style/style_parser.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/style/style_layer.cpp b/src/style/style_layer.cpp index 4f758fe723..d78750195b 100644 --- a/src/style/style_layer.cpp +++ b/src/style/style_layer.cpp @@ -235,6 +235,7 @@ void StyleLayer::applyStyleProperties<BackgroundProperties>(const float z, const BackgroundProperties &background = properties.get<BackgroundProperties>(); applyTransitionedStyleProperty(PropertyKey::BackgroundOpacity, background.opacity, z, now); applyTransitionedStyleProperty(PropertyKey::BackgroundColor, background.color, z, now); + applyStyleProperty(PropertyKey::BackgroundImage, background.image, z, now); } void StyleLayer::updateProperties(float z, const timestamp now) { diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index c2247d51b2..3aa12a6670 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -640,6 +640,7 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) { parseOptionalProperty<Function<float>>("background-opacity", Key::BackgroundOpacity, klass, value); parseOptionalProperty<Function<Color>>("background-color", Key::BackgroundColor, klass, value); + parseOptionalProperty<std::string>("background-image", Key::BackgroundImage, klass, value); } void StyleParser::parseReference(JSVal value, util::ptr<StyleLayer> &layer) { |