diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-05 03:22:04 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-07 15:46:53 -0800 |
| commit | 17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241 (patch) | |
| tree | 8d7a22ac6f52d5f8463b7c17d609a7d70e784dd9 /platform/darwin/scripts/style-spec-cocoa-conventions-v8.json | |
| parent | d5d6bcee0f2f11cfccb3cc8ee7bc90c4f0ac74e7 (diff) | |
| download | qtlocation-mapboxgl-17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241.tar.gz | |
[ios, macos] Renamed text-field, text-font, text-font-size, circle-pitch-scale
Reduced the likelihood that the developer might attempt to set textField to an NSTextField or UITextField, or textFont to an NSFont or UIFont, or textSize to a CGSize or NSSize, or circlePitchScale to a number (given iconScale).
Diffstat (limited to 'platform/darwin/scripts/style-spec-cocoa-conventions-v8.json')
| -rw-r--r-- | platform/darwin/scripts/style-spec-cocoa-conventions-v8.json | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json index 49cf515e3e..4c47d178b5 100644 --- a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json +++ b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json @@ -9,13 +9,19 @@ "icon-size": "icon-scale", "symbol-avoid-edges": "symbol-avoids-edges", "text-allow-overlap": "text-allows-overlap", + "text-field": "text", + "text-font": "text-font-names", "text-ignore-placement": "text-ignores-placement", "text-justify": "text-justification", "text-keep-upright": "keeps-text-upright", "text-max-angle": "maximum-text-angle", "text-max-width": "maximum-text-width", "text-optional": "is-text-optional", - "text-rotate": "text-rotation" + "text-rotate": "text-rotation", + "text-size": "text-font-size" + }, + "paint_circle": { + "circle-pitch-scale": "circle-scale-alignment" }, "paint_raster": { "raster-brightness-min": "minimum-raster-brightness", |