BMenuItem: Check MaxContentWidth for truncation

2013-05-30 00:05:17 -04:00
parent 92c12506ac
commit d926be8ab3
1 changed files with 3 additions and 1 deletions
@@ -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);