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

Restore the BMenuField label background

Browse Source 
Highlighting was added in hrev45983, stopped working in hrev49614, specifically
d891923650.

Add comment to explain what is happening and hopefully deter this from being
removed again in the future.

Fixes #12359
This commit is contained in:
John Scipione 2015-10-14 11:04:16 -07:00
parent 759a228108
commit 8a3ae7a49d
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,16 +1068,30 @@ BMenuField::_DrawLabel(BRect updateRect)
rect = Bounds();
rect.right = fDivider;
}
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
uint32 flags = 0;
if (!IsEnabled())
flags |= BControlLook::B_DISABLED;
be_control_look->DrawLabel(this, label, rect, updateRect, base, flags,
// save the current low color
const rgb_color lowColor = LowColor();
MenuPrivate menuPrivate(fMenuBar);
if (menuPrivate.State() != MENU_STATE_CLOSED) {
// highlight the background of the label grey (like BeOS R5)
SetLowColor(ui_color(B_MENU_SELECTED_BACKGROUND_COLOR));
BRect fillRect(rect.InsetByCopy(0, kVMargin));
FillRect(fillRect, B_SOLID_LOW);
}
be_control_look->DrawLabel(this, label, rect, updateRect, LowColor(), flags,
BAlignment(fAlign, B_ALIGN_MIDDLE));
// restore the previous low color
SetLowColor(lowColor);
}