From d4b907d7d6f512c6ff20e3555f612195eeecedc6 Mon Sep 17 00:00:00 2001
From: Janus <janus2@ymail.com>
Date: Wed, 18 Mar 2015 20:55:38 +0000
Subject: [PATCH] Use user color for selected listItem in FileTypes, Media,
Printers
---
src/preferences/filetypes/MimeTypeListView.cpp | 5 +----
src/preferences/media/MediaListItem.cpp | 6 ++----
src/preferences/printers/JobListView.cpp | 2 +-
src/preferences/printers/PrinterListView.cpp | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp
index 4cd5fca..32b2870 100644
a
|
b
|
MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete)
|
81 | 81 | } |
82 | 82 | |
83 | 83 | if (fShowIcon) { |
84 | | rgb_color highColor = owner->HighColor(); |
85 | 84 | rgb_color lowColor = owner->LowColor(); |
86 | 85 | |
87 | 86 | if (IsSelected() || complete) { |
88 | 87 | if (IsSelected()) |
89 | | owner->SetLowColor(tint_color(lowColor, B_DARKEN_2_TINT)); |
| 88 | owner->SetLowColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR)); |
90 | 89 | |
91 | 90 | owner->FillRect(rect, B_SOLID_LOW); |
92 | 91 | } |
… |
… |
MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete)
|
112 | 111 | owner->SetDrawingMode(B_OP_COPY); |
113 | 112 | |
114 | 113 | owner->MovePenTo(rect.left + B_MINI_ICON + 8.0f, frame.top + fBaselineOffset); |
115 | | owner->SetHighColor(0, 0, 0); |
116 | 114 | owner->DrawString(Text()); |
117 | 115 | |
118 | | owner->SetHighColor(highColor); |
119 | 116 | owner->SetLowColor(lowColor); |
120 | 117 | } else |
121 | 118 | BStringItem::DrawItem(owner, rect, complete); |
diff --git a/src/preferences/media/MediaListItem.cpp b/src/preferences/media/MediaListItem.cpp
index e642384..a89afc2 100644
a
|
b
|
struct MediaListItem::Renderer {
|
76 | 76 | { |
77 | 77 | const rgb_color lowColor = onto->LowColor(); |
78 | 78 | const rgb_color highColor = onto->HighColor(); |
79 | | const rgb_color kBlack = {0, 0, 0, 255}; |
80 | 79 | |
81 | 80 | if (fSelected || complete) { |
82 | 81 | if (fSelected) |
83 | | onto->SetLowColor(tint_color(lowColor, B_DARKEN_2_TINT)); |
| 82 | onto->SetLowColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR)); |
84 | 83 | onto->FillRect(frame, B_SOLID_LOW); |
85 | 84 | } |
86 | 85 | |
… |
… |
struct MediaListItem::Renderer {
|
102 | 101 | frame.left = iconFrame.right + 1; |
103 | 102 | } |
104 | 103 | |
105 | | onto->SetDrawingMode(B_OP_COPY); |
106 | | onto->SetHighColor(kBlack); |
| 104 | onto->SetDrawingMode(B_OP_COPY);; |
107 | 105 | |
108 | 106 | BFont font = be_plain_font; |
109 | 107 | font_height fontInfo; |
diff --git a/src/preferences/printers/JobListView.cpp b/src/preferences/printers/JobListView.cpp
index ff371d9..d634dbc 100644
a
|
b
|
JobItem::DrawItem(BView *owner, BRect, bool complete)
|
277 | 277 | rgb_color oldHighColor = owner->HighColor(); |
278 | 278 | |
279 | 279 | if (IsSelected()) |
280 | | color = tint_color(color, B_HIGHLIGHT_BACKGROUND_TINT); |
| 280 | color = ui_color(B_LIST_SELECTED_BACKGROUND_COLOR); |
281 | 281 | |
282 | 282 | owner->SetViewColor(color); |
283 | 283 | owner->SetHighColor(color); |
diff --git a/src/preferences/printers/PrinterListView.cpp b/src/preferences/printers/PrinterListView.cpp
index 1c7deaa..f46e671 100644
a
|
b
|
PrinterItem::DrawItem(BView *owner, BRect /*bounds*/, bool complete)
|
389 | 389 | rgb_color oldHighColor = owner->HighColor(); |
390 | 390 | |
391 | 391 | if (IsSelected()) |
392 | | color = tint_color(color, B_HIGHLIGHT_BACKGROUND_TINT); |
| 392 | color = ui_color(B_LIST_SELECTED_BACKGROUND_COLOR); |
393 | 393 | |
394 | 394 | owner->SetViewColor(color); |
395 | 395 | owner->SetLowColor(color); |