Tweaked the way the ComboBox popup menu height is calculated, to work with a wider range of sizes.