From 1e634f4d9cb18af004c3ec76ef317f584a282f6a Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 16 Jan 2007 08:36:35 +0000 Subject: [PATCH] Actually use B_COLOR_SELECTION_TEXT when drawing. Patch by Andrea Anzani git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19823 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/ColumnListView.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/ColumnListView.cpp b/src/kits/interface/ColumnListView.cpp index d6a3710d96..9dce0ad436 100644 --- a/src/kits/interface/ColumnListView.cpp +++ b/src/kits/interface/ColumnListView.cpp @@ -2603,7 +2603,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu fDrawBufferView->ConstrainClippingRegion(&clipRegion); fDrawBufferView->PushState(); #endif - fDrawBufferView->SetHighColor(fMasterView->Color(B_COLOR_TEXT)); + fDrawBufferView->SetHighColor(fMasterView->Color(row->fNextSelected ? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT)); float baseline = floor(fieldRect.top + fh.ascent + (fieldRect.Height()+1-(fh.ascent+fh.descent))/2); fDrawBufferView->MovePenTo(fieldRect.left + 8, baseline); @@ -2616,7 +2616,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu if (fFocusRow == row) { if(!fEditMode) { - fDrawBufferView->SetHighColor(0, 0, 0); + SetHighColor(fMasterView->Color(B_COLOR_SELECTION_TEXT)); fDrawBufferView->StrokeRect(BRect(-1, sourceRect.top, 10000.0, sourceRect.bottom - 1)); } } @@ -2657,7 +2657,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu ConstrainClippingRegion(&clipRegion); PushState(); #endif - SetHighColor(fColorList[B_TEXT_COLOR]); + SetHighColor(fColorList[row->fNextSelected ? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT]); float baseline = floor(destRect.top + fh.ascent + (destRect.Height()+1-(fh.ascent+fh.descent))/2); MovePenTo(destRect.left + 8, baseline); @@ -2670,7 +2670,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu if (fFocusRow == row) { if(!fEditMode) { - SetHighColor(0, 0, 0); + SetHighColor(fColorList[B_COLOR_SELECTION_TEXT]); StrokeRect(BRect(0, destRect.top, 10000.0, destRect.bottom - 1)); } } @@ -2812,7 +2812,7 @@ void OutlineView::Draw(BRect invalidBounds) ConstrainClippingRegion(&clipRegion); PushState(); #endif - SetHighColor(fMasterView->Color(B_COLOR_TEXT)); + SetHighColor(fMasterView->Color(row->fNextSelected ? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT)); float baseline = floor(destRect.top + fh.ascent + (destRect.Height()+1-(fh.ascent+fh.descent))/2); MovePenTo(destRect.left + 8, baseline); @@ -2849,7 +2849,7 @@ void OutlineView::Draw(BRect invalidBounds) if (fFocusRow == row && fMasterView->IsFocus() && Window()->IsActive()) { if(!fEditMode) { - SetHighColor(0, 0, 0); + SetHighColor(fMasterView->Color(B_COLOR_SELECTION_TEXT)); StrokeRect(BRect(0, line, 10000.0, line + rowHeight - 1)); } }