diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-03-30 16:43:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-30 16:43:55 -0700 |
| commit | 59e92904c360e5aad94a1b789276bf6147120d7c (patch) | |
| tree | fcb675741c492692324d841f8aaae905a3ccf8f4 /platform/macos/src/NSColor+MGLAdditions.h | |
| parent | b6866f764e5a804399ed60bbbce43a379b568ece (diff) | |
| download | qtlocation-mapboxgl-59e92904c360e5aad94a1b789276bf6147120d7c.tar.gz | |
Eviscerate mbgl expression to Foundation JSON object conversion (#11389)
* [ios, macos] Eviscerate mbgl expression to Foundation JSON object conversion
* [ios, macos] Remove literal special case
MGLJSONObjectFromMBGLValue() is just a literal translation from C++ types to Foundation types; no need for expression-specific literal wrapping.
* [ios, macos] Implemented RGB(A) operators
* [ios, macos] More robust color conversion
* [macos] Create calibrated RGB from expression on Sierra
* [macos] Calibrate colors in expressions at runtime
* [ios, macos] Special-case number conversion without fallbacks
* [ios, macos] Test mgl_number expressions
* [ios, macos] Updated tests for aftermarket expressions
* [ios, macos] Relax roundtripping requirement for serialize()
* [ios, macos] Fixed interpolation expression tests
* [ios, macos] Removed dead code
* [ios, macos] Fixed color conversion on Sierra
Diffstat (limited to 'platform/macos/src/NSColor+MGLAdditions.h')
| -rw-r--r-- | platform/macos/src/NSColor+MGLAdditions.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/platform/macos/src/NSColor+MGLAdditions.h b/platform/macos/src/NSColor+MGLAdditions.h index af9b8b0255..21c939fec6 100644 --- a/platform/macos/src/NSColor+MGLAdditions.h +++ b/platform/macos/src/NSColor+MGLAdditions.h @@ -18,3 +18,10 @@ - (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue; @end + +@interface NSExpression (MGLColorAdditions) + ++ (NSExpression *)mgl_expressionForRGBComponents:(NSArray<NSExpression *> *)components; ++ (NSExpression *)mgl_expressionForRGBAComponents:(NSArray<NSExpression *> *)components; + +@end |