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

ListView: move the color setting code to DrawItem

Browse Source 
... so it can also be used by OutlineListView.

Fixes #11598.
This commit is contained in:
Adrien Destugues 2014-12-11 08:35:09 +01:00
parent 79d01ffb11
commit 265f299627
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/kits/interface/ListView.cpp
View File

@ -207,23 +207,8 @@ BListView::Draw(BRect updateRect)
BListItem* item = ItemAt(i);
itemFrame.bottom = itemFrame.top + ceilf(item->Height()) - 1;
rgb_color textColor = ui_color(B_LIST_ITEM_TEXT_COLOR);
rgb_color disabledColor;
if (textColor.red + textColor.green + textColor.blue > 128 * 3)
disabledColor = tint_color(textColor, B_DARKEN_2_TINT);
else
disabledColor = tint_color(textColor, B_LIGHTEN_2_TINT);
if (itemFrame.Intersects(updateRect)) {
if (!item->IsEnabled())
SetHighColor(disabledColor);
else if (item->IsSelected())
SetHighColor(ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR));
else
SetHighColor(ui_color(B_LIST_ITEM_TEXT_COLOR));
if (itemFrame.Intersects(updateRect))
DrawItem(item, itemFrame);
}
itemFrame.top = itemFrame.bottom + 1;
}
@ -1738,6 +1723,20 @@ BListView::_CalcLastSelected(int32 before)
void
BListView::DrawItem(BListItem* item, BRect itemRect, bool complete)
{
rgb_color textColor = ui_color(B_LIST_ITEM_TEXT_COLOR);
rgb_color disabledColor;
if (textColor.red + textColor.green + textColor.blue > 128 * 3)
disabledColor = tint_color(textColor, B_DARKEN_2_TINT);
else
disabledColor = tint_color(textColor, B_LIGHTEN_2_TINT);
if (!item->IsEnabled())
SetHighColor(disabledColor);
else if (item->IsSelected())
SetHighColor(ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR));
else
SetHighColor(ui_color(B_LIST_ITEM_TEXT_COLOR));
item->DrawItem(this, itemRect, complete);
}

2
src/kits/interface/OutlineListView.cpp
View File

@ -925,7 +925,7 @@ BOutlineListView::DrawItem(BListItem* item, BRect itemRect, bool complete)
}
itemRect.left += LatchRect(itemRect, item->fLevel).right;
item->DrawItem(this, itemRect, complete);
BListView::DrawItem(item, itemRect, complete);
}