ComboBox: rework the choice for centering the popup, and small fix (thanks @wkeese)