diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-08-18 12:19:47 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-08-19 15:45:14 -0700 |
| commit | 0a4f0e40ec6820a052ae8c68b3d58b1b300bb900 (patch) | |
| tree | 18087731fc875e444ac24243e143bab78f05dd05 /platform/darwin/src/MGLSymbolStyleLayer.h | |
| parent | 7f1b325b0c8424d82a3de209a9bdee7a8602b1e0 (diff) | |
| download | qtlocation-mapboxgl-0a4f0e40ec6820a052ae8c68b3d58b1b300bb900.tar.gz | |
[ios, macos] Offsets as vectors, padding as edge insets
An offset style attribute is now exposed publicly as an NSValue representing a CGVector instead of an NSArray of NSNumbers. A padding style attribute is now exposed publicly as an NSValue representing an NSEdgeInsets or UIEdgeInsets instead of an NSArray of NSNumbers. This change also fixes round-tripping of padding values due to a difference between the style specification and Foundation regarding the order of edges around a box. Used a designated initializer on NSEdgeInsets/UIEdgeInsets to ensure correct order when converting from C++ to Objective-C.
Fixes #5947, fixes #6065.
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.h')
| -rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index d77488bdca..643f0fce20 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -155,7 +155,7 @@ typedef NS_ENUM(NSUInteger, MGLSymbolStyleLayerTextTranslateAnchor) { This property is measured in points. - If this property is set to `nil`, the layer uses an implicit default value of 0 points on the top, 0 points on the right, 0 points on the bottom, and 0 points on the left. + If this property is set to `nil`, the layer uses an implicit default value of `NSEdgeInsetsZero` or `UIEdgeInsetsZero`. This property is only applied to the style if `iconImage` is non-`nil`, and `iconTextFit` is non-`nil`, and `textField` is non-`nil`. Otherwise, it is ignored. */ |