summaryrefslogtreecommitdiff
path: root/include/mbgl/map
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-02-24 09:06:43 -0800
committerMinh Nguyễn <mxn@1ec5.org>2016-02-24 09:06:43 -0800
commit17f44d7bd99f2c44e45eadc36d671dc29c88c64d (patch)
tree6b6b534e0d4ca0c06cc9fbfdc17aada2d60870b0 /include/mbgl/map
parent662edea0202b296874894d6df6817f0993ec24a7 (diff)
parentf74900e7046d31721cc4b3e0c0678e85a989cf12 (diff)
downloadqtlocation-mapboxgl-17f44d7bd99f2c44e45eadc36d671dc29c88c64d.tar.gz
Merge branch 'release-ios-v3.1.0'
Diffstat (limited to 'include/mbgl/map')
-rw-r--r--include/mbgl/map/map.hpp4
-rw-r--r--include/mbgl/map/mode.hpp1
2 files changed, 5 insertions, 0 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 8c27b1756a..688565fecb 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -138,6 +138,10 @@ public:
// North Orientation
void setNorthOrientation(NorthOrientation);
NorthOrientation getNorthOrientation() const;
+
+ // Constrain mode
+ void setConstrainMode(ConstrainMode);
+ ConstrainMode getConstrainMode() const;
// Size
uint16_t getWidth() const;
diff --git a/include/mbgl/map/mode.hpp b/include/mbgl/map/mode.hpp
index c197b28589..7fd1a7f522 100644
--- a/include/mbgl/map/mode.hpp
+++ b/include/mbgl/map/mode.hpp
@@ -24,6 +24,7 @@ enum class GLContextMode : EnumType {
// We can choose to constrain the map both horizontally or vertically, or only
// vertically e.g. while panning.
enum class ConstrainMode : EnumType {
+ None,
HeightOnly,
WidthAndHeight,
};