i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMenuItem: Check MaxContentWidth for truncation

Browse Source
This commit is contained in:
John Scipione
2013-05-30 00:05:17 -04:00
parent 92c12506ac
commit d926be8ab3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuItem.cpp
+3 -1
View File
@@ -406,7 +406,9 @@ BMenuItem::DrawContent()
GetContentSize(&labelWidth, &labelHeight); GetContentSize(&labelWidth, &labelHeight);
const BRect& padding = menuPrivate.Padding(); 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)) if (roundf(frameWidth) >= roundf(labelWidth))
fSuper->DrawString(fLabel); fSuper->DrawString(fLabel);