From d1d1535a73ef97f1fcdd5f6f78a008ba528bd11d Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 12 Apr 2016 20:14:29 -0700 Subject: [PATCH] Gravity: Use Set*UIColor() instead of Set*Color(ui_color()) Thanks jessicah! --- src/add-ons/screen_savers/gravity/ColorItem.cpp | 8 ++++---- src/add-ons/screen_savers/gravity/RainbowItem.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/screen_savers/gravity/ColorItem.cpp b/src/add-ons/screen_savers/gravity/ColorItem.cpp index 4929147ed5..e24262689c 100644 --- a/src/add-ons/screen_savers/gravity/ColorItem.cpp +++ b/src/add-ons/screen_savers/gravity/ColorItem.cpp @@ -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()); diff --git a/src/add-ons/screen_savers/gravity/RainbowItem.cpp b/src/add-ons/screen_savers/gravity/RainbowItem.cpp index e0ca379e55..ced330337a 100644 --- a/src/add-ons/screen_savers/gravity/RainbowItem.cpp +++ b/src/add-ons/screen_savers/gravity/RainbowItem.cpp @@ -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());