diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-08 17:30:09 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-09 01:38:20 -0800 |
| commit | a4c44c51585fe1df8e8b38bf5b7b6a611b4ce986 (patch) | |
| tree | bcf9d28429b7a8ae80a2b074fb7fdf7a80038a8e /platform/darwin/src/MGLFillStyleLayer.h | |
| parent | e0f98704061f6e1b3b078da468baea37851391b5 (diff) | |
| download | qtlocation-mapboxgl-a4c44c51585fe1df8e8b38bf5b7b6a611b4ce986.tar.gz | |
[ios, macos] Cleaned up color, edge insets declarations, comments
Eliminated references to MGLColor within style layer headers.
Diffstat (limited to 'platform/darwin/src/MGLFillStyleLayer.h')
| -rw-r--r-- | platform/darwin/src/MGLFillStyleLayer.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLFillStyleLayer.h b/platform/darwin/src/MGLFillStyleLayer.h index 16e1673a44..6fae42cefe 100644 --- a/platform/darwin/src/MGLFillStyleLayer.h +++ b/platform/darwin/src/MGLFillStyleLayer.h @@ -78,7 +78,7 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslationAnchor) { This property is only applied to the style if `fillPattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) MGLStyleValue<MGLColor *> *fillColor; +@property (nonatomic, null_resettable) MGLStyleValue<UIColor *> *fillColor; #else /** The color of the filled part of this layer. @@ -90,7 +90,7 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslationAnchor) { This property is only applied to the style if `fillPattern` is set to `nil`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) MGLStyleValue<MGLColor *> *fillColor; +@property (nonatomic, null_resettable) MGLStyleValue<NSColor *> *fillColor; #endif /** @@ -103,6 +103,16 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslationAnchor) { */ @property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *fillOpacity; +#if TARGET_OS_IPHONE +/** + 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 `fillAntialiased` is set to an `MGLStyleValue` object containing an + `NSNumber` object containing `YES`. Otherwise, it is ignored. + */ +@property (nonatomic, null_resettable) MGLStyleValue<UIColor *> *fillOutlineColor; +#else /** The outline color of the fill. Matches the value of `fillColor` if unspecified. @@ -110,7 +120,8 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslationAnchor) { and `fillAntialiased` is set to an `MGLStyleValue` object containing an `NSNumber` object containing `YES`. Otherwise, it is ignored. */ -@property (nonatomic, null_resettable) MGLStyleValue<MGLColor *> *fillOutlineColor; +@property (nonatomic, null_resettable) MGLStyleValue<NSColor *> *fillOutlineColor; +#endif /** Name of image in sprite to use for drawing image fills. For seamless patterns, |