Fix text field layout on OS X 10.8

Different magic numbers required per OS version :trollface:
Use -sizeToFit instead of magic padding
Merge branch 'btrpopupbutton-alignment' into btrcontrol-state-additions