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

Shortcut chars and bitmaps were drawn too left

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16487 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-02-21 10:57:07 +00:00
parent 6b8c9f5708
commit da13f34ea9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuItem.cpp
+3 -3
View File
@@ -719,7 +719,7 @@ BMenuItem::DrawShortcutSymbol()
else else
control.SetBits(kCtrlBits, kCtrlLength, 0, B_COLOR_8_BIT); control.SetBits(kCtrlBits, kCtrlLength, 0, B_COLOR_8_BIT);
fSuper->DrawBitmap(&control, rect, rect.OffsetByCopy(ContentLocation() + fSuper->DrawBitmap(&control, rect, rect.OffsetByCopy(ContentLocation() +
BPoint(fBounds.Width() - 14.0f - 52.0f, fBounds.Height() - 4.0f - rect.Height()))); BPoint(fBounds.Width() - 52.0f, fBounds.Height() - 4.0f - rect.Height())));
free(chars); free(chars);
free(keys); free(keys);
@@ -729,14 +729,14 @@ BMenuItem::DrawShortcutSymbol()
BBitmap shift(rect, B_COLOR_8_BIT); BBitmap shift(rect, B_COLOR_8_BIT);
shift.SetBits(kShiftBits, kShiftLength, 0, B_COLOR_8_BIT); shift.SetBits(kShiftBits, kShiftLength, 0, B_COLOR_8_BIT);
fSuper->DrawBitmap(&shift, rect, rect.OffsetByCopy(ContentLocation() + fSuper->DrawBitmap(&shift, rect, rect.OffsetByCopy(ContentLocation() +
BPoint(fBounds.Width() - 14.0f - 74.0f, fBounds.Height() - 4.0f - rect.Height()))); BPoint(fBounds.Width() - 74.0f, fBounds.Height() - 4.0f - rect.Height())));
} }
// TODO: If the shortcut is one of B_DOWN_ARROW, B_UP_ARROW, B_ENTER, etc. // TODO: If the shortcut is one of B_DOWN_ARROW, B_UP_ARROW, B_ENTER, etc.
// we can't just use DrawString(), as those aren't valid ascii/UTF8 charachters. // we can't just use DrawString(), as those aren't valid ascii/UTF8 charachters.
// In that case we need to build a BBitmap for the given shortcut and draw it using DrawBitmap() // In that case we need to build a BBitmap for the given shortcut and draw it using DrawBitmap()
fSuper->DrawChar(fShortcutChar, ContentLocation() + fSuper->DrawChar(fShortcutChar, ContentLocation() +
BPoint(fBounds.Width() - 14.0f - 32.0f, fBounds.Height() - 4.0f)); BPoint(fBounds.Width() - 32.0f, fBounds.Height() - 4.0f));
} }