make view active/inactive around Map::setup, don't leave active after view.resize()

This commit is contained in:
Mike Morris
2014-09-30 12:06:51 -04:00
parent 8ebe1bc360
commit 848dccbcae
2 changed files with 4 additions and 2 deletions

View File

@@ -107,13 +107,13 @@ void HeadlessView::resize(uint16_t width, uint16_t height, float pixelRatio) {
}
return;
}
make_inactive();
#endif
#if MBGL_USE_GLX
x_pixmap = XCreatePixmap(x_display, DefaultRootWindow(x_display), width, height, 32);
glx_pixmap = glXCreateGLXPixmap(x_display, x_info, x_pixmap);
make_active();
#endif
}

View File

@@ -186,7 +186,9 @@ void Map::terminate(uv_async_t *async, int status) {
#pragma mark - Setup
void Map::setup() {
view.make_active();
painter.setup();
view.make_inactive();
}
void Map::setStyleURL(const std::string &url) {