More accurate dialog size calculations
Merge pull request #3987 from colemanw/menuHeight

More accurate dialog size calculations