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

Gravity: Use Set*UIColor() instead of Set*Color(ui_color())

Browse Source 
Thanks jessicah!
This commit is contained in:
John Scipione 2016-04-12 20:14:29 -07:00
parent ad5c346a3f
commit d1d1535a73
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add-ons/screen_savers/gravity/ColorItem.cpp
View File

@ -43,7 +43,7 @@ ColorItem::DrawItem(BView* owner, BRect frame, bool complete)
if (IsSelected() || complete) {
if (IsSelected()) {
owner->SetHighColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR));
owner->SetHighUIColor(B_LIST_SELECTED_BACKGROUND_COLOR);
owner->SetLowColor(owner->HighColor());
} else
owner->SetHighColor(lowColor);
@ -63,7 +63,7 @@ ColorItem::DrawItem(BView* owner, BRect frame, bool complete)
owner->FillRect(colorRect);
// draw the border
owner->SetHighColor(ui_color(B_CONTROL_BORDER_COLOR));
owner->SetHighUIColor(B_CONTROL_BORDER_COLOR);
owner->StrokeRect(colorRect);
// draw the string
@ -77,9 +77,9 @@ ColorItem::DrawItem(BView* owner, BRect frame, bool complete)
owner->SetHighColor(tint_color(textColor, B_LIGHTEN_2_TINT));
} else {
if (IsSelected())
owner->SetHighColor(ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR));
owner->SetHighUIColor(B_LIST_SELECTED_ITEM_TEXT_COLOR);
else
owner->SetHighColor(ui_color(B_LIST_ITEM_TEXT_COLOR));
owner->SetHighUIColor(B_LIST_ITEM_TEXT_COLOR);
}
owner->DrawString(Text());

8
src/add-ons/screen_savers/gravity/RainbowItem.cpp
View File

@ -42,7 +42,7 @@ RainbowItem::DrawItem(BView* owner, BRect frame, bool complete)
if (IsSelected() || complete) {
if (IsSelected()) {
owner->SetHighColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR));
owner->SetHighUIColor(B_LIST_SELECTED_BACKGROUND_COLOR);
owner->SetLowColor(owner->HighColor());
} else
owner->SetHighColor(lowColor);
@ -71,7 +71,7 @@ RainbowItem::DrawItem(BView* owner, BRect frame, bool complete)
owner->FillRect(colorRect, gradient);
// draw the border
owner->SetHighColor(ui_color(B_CONTROL_BORDER_COLOR));
owner->SetHighUIColor(B_CONTROL_BORDER_COLOR);
owner->StrokeRect(colorRect);
// draw the string
@ -85,9 +85,9 @@ RainbowItem::DrawItem(BView* owner, BRect frame, bool complete)
owner->SetHighColor(tint_color(textColor, B_LIGHTEN_2_TINT));
} else {
if (IsSelected())
owner->SetHighColor(ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR));
owner->SetHighUIColor(B_LIST_SELECTED_ITEM_TEXT_COLOR);
else
owner->SetHighColor(ui_color(B_LIST_ITEM_TEXT_COLOR));
owner->SetHighUIColor(B_LIST_ITEM_TEXT_COLOR);
}
owner->DrawString(Text());