i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actually use B_COLOR_SELECTION_TEXT when drawing. Patch by Andrea Anzani

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19823 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-01-16 08:36:35 +00:00
parent 8d7ddfde53
commit 1e634f4d9c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ColumnListView.cpp
+6 -6
View File
@@ -2603,7 +2603,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu
fDrawBufferView->ConstrainClippingRegion(&clipRegion); fDrawBufferView->ConstrainClippingRegion(&clipRegion);
fDrawBufferView->PushState(); fDrawBufferView->PushState();
#endif #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 float baseline = floor(fieldRect.top + fh.ascent
+ (fieldRect.Height()+1-(fh.ascent+fh.descent))/2); + (fieldRect.Height()+1-(fh.ascent+fh.descent))/2);
fDrawBufferView->MovePenTo(fieldRect.left + 8, baseline); fDrawBufferView->MovePenTo(fieldRect.left + 8, baseline);
@@ -2616,7 +2616,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu
if (fFocusRow == row) { if (fFocusRow == row) {
if(!fEditMode) { 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)); 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); ConstrainClippingRegion(&clipRegion);
PushState(); PushState();
#endif #endif
SetHighColor(fColorList[B_TEXT_COLOR]); SetHighColor(fColorList[row->fNextSelected ? B_COLOR_SELECTION_TEXT : B_COLOR_TEXT]);
float baseline = floor(destRect.top + fh.ascent float baseline = floor(destRect.top + fh.ascent
+ (destRect.Height()+1-(fh.ascent+fh.descent))/2); + (destRect.Height()+1-(fh.ascent+fh.descent))/2);
MovePenTo(destRect.left + 8, baseline); MovePenTo(destRect.left + 8, baseline);
@@ -2670,7 +2670,7 @@ void OutlineView::RedrawColumn(BColumn *column, float leftEdge, bool isFirstColu
if (fFocusRow == row) { if (fFocusRow == row) {
if(!fEditMode) { if(!fEditMode) {
SetHighColor(0, 0, 0); SetHighColor(fColorList[B_COLOR_SELECTION_TEXT]);
StrokeRect(BRect(0, destRect.top, 10000.0, destRect.bottom - 1)); StrokeRect(BRect(0, destRect.top, 10000.0, destRect.bottom - 1));
} }
} }
@@ -2812,7 +2812,7 @@ void OutlineView::Draw(BRect invalidBounds)
ConstrainClippingRegion(&clipRegion); ConstrainClippingRegion(&clipRegion);
PushState(); PushState();
#endif #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 float baseline = floor(destRect.top + fh.ascent
+ (destRect.Height()+1-(fh.ascent+fh.descent))/2); + (destRect.Height()+1-(fh.ascent+fh.descent))/2);
MovePenTo(destRect.left + 8, baseline); MovePenTo(destRect.left + 8, baseline);
@@ -2849,7 +2849,7 @@ void OutlineView::Draw(BRect invalidBounds)
if (fFocusRow == row && fMasterView->IsFocus() && Window()->IsActive()) { if (fFocusRow == row && fMasterView->IsFocus() && Window()->IsActive()) {
if(!fEditMode) { if(!fEditMode) {
SetHighColor(0, 0, 0); SetHighColor(fMasterView->Color(B_COLOR_SELECTION_TEXT));
StrokeRect(BRect(0, line, 10000.0, line + rowHeight - 1)); StrokeRect(BRect(0, line, 10000.0, line + rowHeight - 1));
} }
} }