[util] Account for line-space in surface size
3 files changed