Touch up detection improved.
Moved calculations out of onDraw()