From 199ea2a82a74cf2f7b63078e2dd4b8274c061851 Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Wed, 15 Jun 2016 17:13:31 -0400
Subject: Support for icon-text-fit, icon-text-fit-padding (#5334)

* Add support for icon-text-fit

* Port unit tests for getIconQuads() from js => cpp

* Add support for padding in all 4 directions.

* Update all hashes post-merge
---
 include/mbgl/style/layers/symbol_layer.hpp | 6 ++++++
 include/mbgl/style/types.hpp               | 7 +++++++
 2 files changed, 13 insertions(+)

(limited to 'include')

diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 676d90d5b9..7d98a5ef6b 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -53,6 +53,12 @@ public:
     PropertyValue<float> getIconSize() const;
     void setIconSize(PropertyValue<float>);
 
+    PropertyValue<IconTextFitType> getIconTextFit() const;
+    void setIconTextFit(PropertyValue<IconTextFitType>);
+
+    PropertyValue<std::array<float, 4>> getIconTextFitPadding() const;
+    void setIconTextFitPadding(PropertyValue<std::array<float, 4>>);
+
     PropertyValue<std::string> getIconImage() const;
     void setIconImage(PropertyValue<std::string>);
 
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 46c0cb3c39..28ebda9fb9 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -80,5 +80,12 @@ enum class TextTransformType : uint8_t {
     Lowercase,
 };
 
+enum class IconTextFitType : uint8_t {
+    None,
+    Both,
+    Width,
+    Height
+};
+
 } // namespace style
 } // namespace mbgl
-- 
cgit v1.2.1