Commit 5e409e0b authored by Alexandre Bailly's avatar Alexandre Bailly

Merge remote-tracking branch 'upstream/master'

parents 1f4eca39 02674d55
Pipeline #7136 passed with stage
in 23 seconds
......@@ -2888,7 +2888,7 @@ let SubtitleManager = (function() {
if (collision[0] && collision[1] && collision[0].visible && collision[1].visible) {
let B0 = collision[0].bounds(), B1 = collision[1].bounds();
if (boundsOverlap(B0,B1)) {
let overlap = region == "upper" ? B1.bottom - B0.top : B0.top - B1.bottom;
let overlap = region == "upper" ? B0.bottom - B1.top : B1.top - B0.bottom;
collision[1].collisionOffset += overlap;
collision[1].updatePosition();
anyCollisions = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment