Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the unused bounds parameter from DrawLabel

Browse Source 
Also refactor BMenuField::Draw()
This commit is contained in:
John Scipione 2013-05-09 20:54:58 -04:00
parent 869e4bdca3
commit f6d93b80f3
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/os/interface/MenuField.h
View File

@ -123,7 +123,7 @@ private:
void InitObject(const char* label);
void InitObject2();
void DrawLabel(BRect bounds, BRect updateRect);
void DrawLabel(BRect updateRect);
static void InitMenu(BMenu* menu);
int32 _MenuTask();

17
src/kits/interface/MenuField.cpp
View File

@ -356,22 +356,19 @@ BMenuField::AllUnarchived(const BMessage* from)
void
BMenuField::Draw(BRect updateRect)
{
BRect bounds(Bounds());
bool active = IsFocus() && Window()->IsActive();
DrawLabel(updateRect);
DrawLabel(bounds, updateRect);
BRect frame(fMenuBar->Frame());
frame.InsetBy(-kVMargin, -kVMargin);
BRect rect(fMenuBar->Frame());
rect.InsetBy(-kVMargin, -kVMargin);
rgb_color base = fMenuBar->LowColor();
rgb_color background = LowColor();
uint32 flags = 0;
if (!fMenuBar->IsEnabled())
flags |= BControlLook::B_DISABLED;
if (active)
if (IsFocus() && Window()->IsActive())
flags |= BControlLook::B_FOCUSED;
be_control_look->DrawMenuFieldFrame(this, frame, updateRect, base,
be_control_look->DrawMenuFieldFrame(this, rect, updateRect, base,
background, flags);
}
@ -981,7 +978,7 @@ BMenuField::InitObject2()
void
BMenuField::DrawLabel(BRect bounds, BRect updateRect)
BMenuField::DrawLabel(BRect updateRect)
{
CALLED();