Merge pull request #13975 from mike-000/do-not-scale-displacement

Do not scale Icon and RegularShape displacement
This commit is contained in:
Andreas Hocevar
2022-08-18 12:30:20 +02:00
committed by GitHub
7 changed files with 88 additions and 3 deletions
+7 -1
View File
@@ -293,7 +293,13 @@ class Icon extends ImageStyle {
this.normalizedAnchor_ = anchor;
}
const displacement = this.getDisplacement();
return [anchor[0] - displacement[0], anchor[1] + displacement[1]];
const scale = this.getScaleArray();
// anchor is scaled by renderer but displacement should not be scaled
// so divide by scale here
return [
anchor[0] - displacement[0] / scale[0],
anchor[1] + displacement[1] / scale[1],
];
}
/**
+7 -1
View File
@@ -179,7 +179,13 @@ class RegularShape extends ImageStyle {
return null;
}
const displacement = this.getDisplacement();
return [size[0] / 2 - displacement[0], size[1] / 2 + displacement[1]];
const scale = this.getScaleArray();
// anchor is scaled by renderer but displacement should not be scaled
// so divide by scale here
return [
size[0] / 2 - displacement[0] / scale[0],
size[1] / 2 + displacement[1] / scale[1],
];
}
/**