diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 13:19:52 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-22 09:21:30 -0700 |
| commit | df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb (patch) | |
| tree | ecac13b203cd45451aeff565cb11b179a5ef84d6 /platform | |
| parent | 83d39364f9de987d7840900db2e01673bc1ed6ef (diff) | |
| download | qtlocation-mapboxgl-df89de5cc5bf043ca2fe57ef4dd9a7b5d25464cb.tar.gz | |
[core] Rationalize style property classes: <type>{Paint,Layout}Properties
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/glfw_view.cpp | 4 | ||||
| -rw-r--r-- | platform/ios/MGLMapView.mm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index cf7bb01213..78461462d1 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -223,11 +223,11 @@ void GLFWView::addRandomPointAnnotations(int count) { void GLFWView::addRandomShapeAnnotations(int count) { std::vector<mbgl::ShapeAnnotation> shapes; - mbgl::FillProperties fillProperties; + mbgl::FillPaintProperties fillProperties; fillProperties.opacity = .1; mbgl::StyleProperties properties; - properties.set<mbgl::FillProperties>(fillProperties); + properties.set<mbgl::FillPaintProperties>(fillProperties); for (int i = 0; i < count; i++) { mbgl::AnnotationSegment triangle; diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index ae9411dfc1..4165cd3974 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -2175,11 +2175,11 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) [self.delegate mapView:self lineWidthForPolylineAnnotation:(MGLPolyline *)annotation] : 3.0); - mbgl::LineProperties lineProperties; + mbgl::LinePaintProperties lineProperties; lineProperties.opacity = alpha; lineProperties.color = strokeNativeColor; lineProperties.width = lineWidth; - shapeProperties.set<mbgl::LineProperties>(lineProperties); + shapeProperties.set<mbgl::LinePaintProperties>(lineProperties); } else if ([annotation isKindOfClass:[MGLPolygon class]]) @@ -2193,11 +2193,11 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) [fillColor getRed:&r green:&g blue:&b alpha:&a]; mbgl::Color fillNativeColor({{ (float)r, (float)g, (float)b, (float)a }}); - mbgl::FillProperties fillProperties; + mbgl::FillPaintProperties fillProperties; fillProperties.opacity = alpha; fillProperties.stroke_color = strokeNativeColor; fillProperties.fill_color = fillNativeColor; - shapeProperties.set<mbgl::FillProperties>(fillProperties); + shapeProperties.set<mbgl::FillPaintProperties>(fillProperties); } else { |