From d926be8ab3ebf6c55999544b4d836e69f1c89203 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Wed, 29 May 2013 23:54:32 -0400 Subject: [PATCH] BMenuItem: Check MaxContentWidth for truncation --- src/kits/interface/MenuItem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index 4e5691b2ab..60e9abd924 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -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);