[MWF] Fix bug that truncates button text

A previous change (885b065e) accidentally calculated the text size
in some places without padding. This resulted in a slightly to small
text rectangle, causing the text to be truncated.
Merge pull request #1415 from ermshiperete/FixTruncatedButton

[MWF] Fix bug that truncates button text