Fixes #2329 - include widget heights in estimates

If a line has widgets with heights, use them when estimating line height.

This prevents a .refresh() call from reverting to less accurate line
heights.