BMenuItem: Check MaxContentWidth for truncation

This commit is contained in:
John Scipione 2013-05-29 23:54:32 -04:00
parent 92c12506ac
commit d926be8ab3
1 changed files with 3 additions and 1 deletions

View File

@ -406,7 +406,9 @@ BMenuItem::DrawContent()
GetContentSize(&labelWidth, &labelHeight);
const BRect& padding = menuPrivate.Padding();
float frameWidth = fSuper->Frame().Width() - padding.left - padding.right;
float maxContentWidth = fSuper->MaxContentWidth();
float frameWidth = maxContentWidth > 0 ? maxContentWidth
: fSuper->Frame().Width() - padding.left - padding.right;
if (roundf(frameWidth) >= roundf(labelWidth))
fSuper->DrawString(fLabel);