-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Conversation
|
||
if (!painter) { | ||
painter = util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation is broken here, no?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed, thanks.
8beeeae
to
455b394
Compare
Initialise NativeMapView's EGL variables before Map Fix hang Add check for double pause Add test for double pause
455b394
to
703e0bc
Compare
@jfirebaugh Can your review this and merge if happy once Travis passes (it should). |
Travis passed, ready for merging. |
This looks mostly on the Android c++ side of the house so it should be good to merge in. |
_mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous, _isTargetingInterfaceBuilder); | ||
_mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous); | ||
if (_isTargetingInterfaceBuilder) { | ||
_mbglMap->pause(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you test this change in Interface Builder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, it does seem to work in Interface Builder designables, and MGLMapView
s instantiated from storyboards seem to work fine.
Tracking commits for updating the Android to Core GL integration for #1435