summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLFillStyleLayer.h
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-08-19 14:32:50 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-08-19 14:32:50 -0700
commit7f1b325b0c8424d82a3de209a9bdee7a8602b1e0 (patch)
treedcbd38fde0513361e410b6fe7a6ccd974efb9bee /platform/darwin/src/MGLFillStyleLayer.h
parent98787b37bfd334a4f921de46ac3d2320a3c8c49a (diff)
downloadqtlocation-mapboxgl-7f1b325b0c8424d82a3de209a9bdee7a8602b1e0.tar.gz
[ios, macos] Optional properties are nullable
null_resettable semantics aren’t currently respected: #6095.
Diffstat (limited to 'platform/darwin/src/MGLFillStyleLayer.h')
-rw-r--r--platform/darwin/src/MGLFillStyleLayer.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/platform/darwin/src/MGLFillStyleLayer.h b/platform/darwin/src/MGLFillStyleLayer.h
index 26a438af30..dc724eb48a 100644
--- a/platform/darwin/src/MGLFillStyleLayer.h
+++ b/platform/darwin/src/MGLFillStyleLayer.h
@@ -18,55 +18,55 @@ typedef NS_ENUM(NSUInteger, MGLFillStyleLayerFillTranslateAnchor) {
/**
Whether or not the fill should be antialiased.
- The default value of this property is `YES`. Set this property to `nil` to reset it to the default.
+ If this property is set to `nil`, the layer uses an implicit default value of `YES`.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillAntialias;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillAntialias;
/**
The opacity of the entire fill layer. In contrast to the fill-color, this value will also affect the 1pt stroke around the fill, if the stroke is used.
- The default value of this property is `1`. Set this property to `nil` to reset it to the default.
+ If this property is set to `nil`, the layer uses an implicit default value of `1`.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillOpacity;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillOpacity;
/**
The color of the filled part of this layer. This color can be specified as rgba with an alpha component and the color's opacity will not affect the opacity of the 1pt stroke, if it is used.
- The default value of this property is an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1. Set this property to `nil` to reset it to the default.
-
+ If this property is set to `nil`, the layer uses an implicit default value of an `NSColor` or `UIColor`object whose RGB value is 0, 0, 0 and whose alpha value is 1.
+
This property is only applied to the style if `fillPattern` is set to `nil`. Otherwise, it is ignored.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillColor;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillColor;
/**
The outline color of the fill. Matches the value of `fillColor` if unspecified.
-
+
This property is only applied to the style if `fillPattern` is set to `nil`, and `fillAntialias` is set to `YES`. Otherwise, it is ignored.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillOutlineColor;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillOutlineColor;
/**
The geometry's offset. Values are [x, y] where negatives indicate left and up, respectively.
This property is measured in points.
- The default value of this property is 0 points from the left and 0 points from the top. Set this property to `nil` to reset it to the default.
+ If this property is set to `nil`, the layer uses an implicit default value of 0 points from the left and 0 points from the top.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillTranslate;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillTranslate;
/**
Control whether the translation is relative to the map (north) or viewport (screen)
- The default value of this property is `MGLFillStyleLayerFillTranslateAnchorMap`. Set this property to `nil` to reset it to the default.
-
+ If this property is set to `nil`, the layer uses an implicit default value of `MGLFillStyleLayerFillTranslateAnchorMap`.
+
This property is only applied to the style if `fillTranslate` is non-`nil`. Otherwise, it is ignored.
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillTranslateAnchor;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillTranslateAnchor;
/**
Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).
*/
-@property (nonatomic, null_resettable) id <MGLStyleAttributeValue> fillPattern;
+@property (nonatomic, nullable) id <MGLStyleAttributeValue> fillPattern;
@end