Revert "applied fix for #1172 - Clear button overlaps text"

This reverts commit fd07c11484caf2f515f17edfbb576b2b28f2366f.
Fix #1172 -- Properly set width when allowClear is being used.

Signed-off-by: Igor Vaynberg <igor.vaynberg@gmail.com>