Merge branch 'release-ios-v3.1.0'

This commit is contained in:
Minh Nguyễn
2016-02-24 09:06:43 -08:00
18 changed files with 204 additions and 77 deletions

View File

@@ -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;

View File

@@ -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,
};