Skip to content

Commit

Permalink
Fix #6211 (tooltip position incorrect when moved in bmap)
Browse files Browse the repository at this point in the history
  • Loading branch information
100pah committed Jul 14, 2017
1 parent 640d354 commit b3f3425
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion extension/bmap/BMapCoordSys.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ define(function (require) {

// TODO Dispose
ecModel.eachComponent('bmap', function (bmapModel) {
var viewportRoot = api.getZr().painter.getViewportRoot();
var painter = api.getZr().painter;
var viewportRoot = painter.getViewportRoot();
if (typeof BMap === 'undefined') {
throw new Error('BMap api is not loaded');
}
Expand All @@ -160,6 +161,11 @@ define(function (require) {

var overlay = new Overlay(viewportRoot);
bmap.addOverlay(overlay);

// Override
painter.getViewportRootOffset = function () {
return {offsetLeft: 0, offsetTop: 0};
};
}
var bmap = bmapModel.__bmap;

Expand Down
8 changes: 4 additions & 4 deletions src/component/tooltip/TooltipContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ define(function (require) {
// the sibling of canvas root. So padding of ec container
// should be considered here.
var zr = this._zr;
var viewportRoot;
if (zr && zr.painter && (viewportRoot = zr.painter.getViewportRoot())) {
x += viewportRoot.offsetLeft || 0;
y += viewportRoot.offsetTop || 0;
var viewportRootOffset;
if (zr && zr.painter && (viewportRootOffset = zr.painter.getViewportRootOffset())) {
x += viewportRootOffset.offsetLeft;
y += viewportRootOffset.offsetTop;
}

var style = this.el.style;
Expand Down

0 comments on commit b3f3425

Please sign in to comment.