resolve conflict

This commit is contained in:
Mark 2018-02-09 11:30:56 +01:00
parent e7e476cb15
commit b52bf6decf
17 changed files with 75 additions and 75 deletions

View file

@ -36,7 +36,7 @@ UM.PointingRectangle {
}
}
base.opacity = 1;
target = Qt.point(40 , position.y + UM.Theme.getSize("tooltip_arrow_margins").height / 2)
target = Qt.point(40 , position.y + Math.floor(UM.Theme.getSize("tooltip_arrow_margins").height / 2))
}
function hide() {