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

Some style fixes in MenuItem

Browse Source
This commit is contained in:
John Scipione
2013-05-05 13:12:15 -04:00
parent dff48661fd
commit ddd6037113
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuItem.cpp
+7 -6
View File
@@ -358,7 +358,7 @@ BMenuItem::Frame() const
void void
BMenuItem::GetContentSize(float *width, float *height) BMenuItem::GetContentSize(float* width, float* height)
{ {
// TODO: Get rid of this. BMenu should handle this // TODO: Get rid of this. BMenu should handle this
// automatically. Maybe it's not even needed, since our // automatically. Maybe it's not even needed, since our
@@ -376,7 +376,7 @@ BMenuItem::GetContentSize(float *width, float *height)
void void
BMenuItem::TruncateLabel(float maxWidth, char *newLabel) BMenuItem::TruncateLabel(float maxWidth, char* newLabel)
{ {
BFont font; BFont font;
fSuper->GetFont(&font); fSuper->GetFont(&font);
@@ -406,16 +406,17 @@ BMenuItem::DrawContent()
float frameWidth = fBounds.Width(); float frameWidth = fBounds.Width();
if (menuPrivate.State() == MENU_STATE_CLOSED) { if (menuPrivate.State() == MENU_STATE_CLOSED) {
float rightMargin, leftMargin; float leftMargin;
float rightMargin;
menuPrivate.GetItemMargins(&leftMargin, NULL, &rightMargin, NULL); menuPrivate.GetItemMargins(&leftMargin, NULL, &rightMargin, NULL);
frameWidth = fSuper->Frame().Width() - (rightMargin + leftMargin); frameWidth = fSuper->Frame().Width() - rightMargin + leftMargin;
} }
// truncate if needed
if (frameWidth >= labelWidth) if (frameWidth >= labelWidth)
fSuper->DrawString(fLabel); fSuper->DrawString(fLabel);
else { else {
char *truncatedLabel = new char[strlen(fLabel) + 4]; // truncate the label to fit
char* truncatedLabel = new char[strlen(fLabel) + 4];
TruncateLabel(frameWidth, truncatedLabel); TruncateLabel(frameWidth, truncatedLabel);
fSuper->DrawString(truncatedLabel); fSuper->DrawString(truncatedLabel);
delete[] truncatedLabel; delete[] truncatedLabel;