diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-06-19 22:07:32 +0300 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-08-13 13:32:56 +0300 |
commit | 0ff218d688084146fee178ce52c17f346fa67198 (patch) | |
tree | 75378687211bc16b81ab68e9e2cc53ee3c5f8761 /platform/darwin/src/MGLSymbolStyleLayer.mm | |
parent | f94460041353be26eb7516d7006a2c83a4aa19f2 (diff) | |
download | qtlocation-mapboxgl-0ff218d688084146fee178ce52c17f346fa67198.tar.gz |
[darwin] Add plural override for 'text-writing-mode' layout property
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm index 99cfe5db10..e60da45a38 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.mm +++ b/platform/darwin/src/MGLSymbolStyleLayer.mm @@ -96,9 +96,9 @@ namespace mbgl { { MGLTextTransformLowercase, "lowercase" }, }); - MBGL_DEFINE_ENUM(MGLTextWritingMode, { - { MGLTextWritingModeHorizontal, "horizontal" }, - { MGLTextWritingModeVertical, "vertical" }, + MBGL_DEFINE_ENUM(MGLTextWritingModes, { + { MGLTextWritingModesHorizontal, "horizontal" }, + { MGLTextWritingModesVertical, "vertical" }, }); MBGL_DEFINE_ENUM(MGLIconTranslationAnchor, { @@ -1028,22 +1028,29 @@ namespace mbgl { return MGLStyleValueTransformer<std::vector<mbgl::style::SymbolAnchorType>, NSArray<NSValue *> *, mbgl::style::SymbolAnchorType, MGLTextAnchor>().toExpression(propertyValue); } -- (void)setTextWritingMode:(NSExpression *)textWritingMode { +- (void)setTextWritingModes:(NSExpression *)textWritingModes { MGLAssertStyleLayerIsValid(); - MGLLogDebug(@"Setting textWritingMode: %@", textWritingMode); + MGLLogDebug(@"Setting textWritingModes: %@", textWritingModes); - auto mbglValue = MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingMode>().toPropertyValue<mbgl::style::PropertyValue<std::vector<mbgl::style::TextWritingModeType>>>(textWritingMode, false); + auto mbglValue = MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingModes>().toPropertyValue<mbgl::style::PropertyValue<std::vector<mbgl::style::TextWritingModeType>>>(textWritingModes, false); self.rawLayer->setTextWritingMode(mbglValue); } -- (NSExpression *)textWritingMode { +- (NSExpression *)textWritingModes { MGLAssertStyleLayerIsValid(); auto propertyValue = self.rawLayer->getTextWritingMode(); if (propertyValue.isUndefined()) { propertyValue = self.rawLayer->getDefaultTextWritingMode(); } - return MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingMode>().toExpression(propertyValue); + return MGLStyleValueTransformer<std::vector<mbgl::style::TextWritingModeType>, NSArray<NSValue *> *, mbgl::style::TextWritingModeType, MGLTextWritingModes>().toExpression(propertyValue); +} + +- (void)setTextWritingMode:(NSExpression *)textWritingMode { +} + +- (NSExpression *)textWritingMode { + return self.textWritingModes; } #pragma mark - Accessing the Paint Attributes @@ -1622,14 +1629,14 @@ namespace mbgl { return textTransform; } -+ (NSValue *)valueWithMGLTextWritingMode:(MGLTextWritingMode)textWritingMode { - return [NSValue value:&textWritingMode withObjCType:@encode(MGLTextWritingMode)]; ++ (NSValue *)valueWithMGLTextWritingModes:(MGLTextWritingModes)textWritingModes { + return [NSValue value:&textWritingModes withObjCType:@encode(MGLTextWritingModes)]; } -- (MGLTextWritingMode)MGLTextWritingModeValue { - MGLTextWritingMode textWritingMode; - [self getValue:&textWritingMode]; - return textWritingMode; +- (MGLTextWritingModes)MGLTextWritingModesValue { + MGLTextWritingModes textWritingModes; + [self getValue:&textWritingModes]; + return textWritingModes; } + (NSValue *)valueWithMGLIconTranslationAnchor:(MGLIconTranslationAnchor)iconTranslationAnchor { |