From def864c05dd5518c1c13e7d9e0da5e04d696b4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 15 Aug 2010 15:49:09 +0000 Subject: [PATCH] Fix some blatantly missing uses of ui_color(), but there is a lot of work to do here... BControlLook itself doesn't even respect those correctly either... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38121 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/aboutsystem/AboutSystem.cpp | 1 + src/apps/magnify/Magnify.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 202a6a9b60..1020d42b7b 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -848,6 +848,7 @@ AboutView::_CreateCreditsView() fCreditsView->MakeEditable(false); fCreditsView->SetWordWrap(true); fCreditsView->SetInsets(5, 5, 5, 5); + fCreditsView->SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR)); BScrollView* creditsScroller = new BScrollView("creditsScroller", fCreditsView, B_WILL_DRAW | B_FRAME_EVENTS, false, true, diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp index 7e548d8375..b8fad16011 100644 --- a/src/apps/magnify/Magnify.cpp +++ b/src/apps/magnify/Magnify.cpp @@ -897,7 +897,7 @@ TInfoView::Draw(BRect updateRect) invalRect.Set(10, 5, 10 + StringWidth(fInfoStr), fFontHeight+7); SetHighColor(ViewColor()); FillRect(invalRect); - SetHighColor(0, 0, 0, 255); + SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); strcpy(fInfoStr, str); DrawString(fInfoStr); @@ -914,7 +914,7 @@ TInfoView::Draw(BRect updateRect) invalRect.Set(10, fFontHeight+7, 10 + StringWidth(fRGBStr), fFontHeight*2+7); SetHighColor(ViewColor()); FillRect(invalRect); - SetHighColor(0,0,0,255); + SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); strcpy(fRGBStr,str); DrawString(fRGBStr); @@ -933,7 +933,7 @@ TInfoView::Draw(BRect updateRect) invalRect.Set(10, h-12-fFontHeight, 10 + StringWidth(fCH2Str), h-10); SetHighColor(ViewColor()); FillRect(invalRect); - SetHighColor(0,0,0,255); + SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); strcpy(fCH2Str,str); DrawString(fCH2Str); } @@ -945,7 +945,7 @@ TInfoView::Draw(BRect updateRect) invalRect.Set(10, h-10-2*fFontHeight-2, 10 + StringWidth(fCH1Str), h-10-fFontHeight); SetHighColor(ViewColor()); FillRect(invalRect); - SetHighColor(0,0,0,255); + SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); strcpy(fCH1Str,str); DrawString(fCH1Str); } else if (ch1Showing) { @@ -954,7 +954,7 @@ TInfoView::Draw(BRect updateRect) invalRect.Set(10, h-10-fFontHeight, 10 + StringWidth(fCH1Str), h-8); SetHighColor(ViewColor()); FillRect(invalRect); - SetHighColor(0,0,0,255); + SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); strcpy(fCH1Str,str); DrawString(fCH1Str); }