From aa05612321c6b52f68e2490ae16b5f62ad9c87b4 Mon Sep 17 00:00:00 2001 From: Janus Date: Mon, 6 Apr 2015 11:21:59 +0000 Subject: [PATCH] User interface: Use user colors in menu and list items. * Use user colors for selected menuItem in ProcessController * Use user colors for selected listItem in FileTypes, Media, Printers * Fixes the menuItem and listItem part of #10840. The BColumnListView and other widgets need more thoughts. --- src/apps/processcontroller/KernelMemoryBarMenuItem.cpp | 5 +++-- src/apps/processcontroller/MemoryBarMenuItem.cpp | 9 +++++++-- src/apps/processcontroller/NoiseBarMenuItem.cpp | 5 +++-- src/apps/processcontroller/TeamBarMenuItem.cpp | 3 ++- src/apps/processcontroller/ThreadBarMenuItem.cpp | 3 ++- src/preferences/filetypes/MimeTypeListView.cpp | 5 +---- src/preferences/media/MediaListItem.cpp | 4 +--- src/preferences/printers/JobListView.cpp | 2 +- src/preferences/printers/PrinterListView.cpp | 2 +- 9 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp index 8b7772b155..30b5fe0a1a 100644 --- a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp @@ -70,6 +70,7 @@ KernelMemoryBarMenuItem::DrawBar(bool force) bool selected = IsSelected(); BRect frame = Frame(); BMenu* menu = Menu(); + rgb_color highColor = menu->HighColor(); // draw the bar itself BRect cadre (frame.right - kMargin - kBarWidth, frame.top + 5, @@ -133,7 +134,7 @@ KernelMemoryBarMenuItem::DrawBar(bool force) menu->SetHighColor(kWhite); menu->FillRect(r); } - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); fGrenze1 = grenze1; fGrenze2 = grenze2; @@ -150,7 +151,7 @@ KernelMemoryBarMenuItem::DrawBar(bool force) BRect trect(cadre.left - kMargin - gMemoryTextWidth, frame.top, cadre.left - kMargin, frame.bottom); menu->FillRect(trect); - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); char infos[128]; string_for_size(fCachedMemory * 1024.0, infos, sizeof(infos)); diff --git a/src/apps/processcontroller/MemoryBarMenuItem.cpp b/src/apps/processcontroller/MemoryBarMenuItem.cpp index bd5ccb7f60..d8d087f913 100644 --- a/src/apps/processcontroller/MemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/MemoryBarMenuItem.cpp @@ -114,6 +114,7 @@ MemoryBarMenuItem::DrawBar(bool force) bool selected = IsSelected(); BRect frame = Frame(); BMenu* menu = Menu(); + rgb_color highColor = menu->HighColor(); // draw the bar itself @@ -186,7 +187,7 @@ MemoryBarMenuItem::DrawBar(bool force) menu->FillRect(r); } - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); fGrenze1 = grenze1; fGrenze2 = grenze2; @@ -210,7 +211,10 @@ MemoryBarMenuItem::DrawBar(bool force) fLastWrite = fWriteMemory; fLastAll = fAllMemory; - menu->SetHighColor(kBlack); + if (selected) + menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR)); + else + menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR)); char infos[128]; string_for_size(fWriteMemory * 1024.0, infos, sizeof(infos)); @@ -222,6 +226,7 @@ MemoryBarMenuItem::DrawBar(bool force) string_for_size(fAllMemory * 1024.0, infos, sizeof(infos)); loc.x = rect.left - kMargin - menu->StringWidth(infos); menu->DrawString(infos, loc); + menu->SetHighColor(highColor); } diff --git a/src/apps/processcontroller/NoiseBarMenuItem.cpp b/src/apps/processcontroller/NoiseBarMenuItem.cpp index 5f5380754a..9446a06a98 100644 --- a/src/apps/processcontroller/NoiseBarMenuItem.cpp +++ b/src/apps/processcontroller/NoiseBarMenuItem.cpp @@ -51,6 +51,7 @@ NoiseBarMenuItem::DrawBar(bool force) bool selected = IsSelected(); BRect frame = Frame(); BMenu* menu = Menu(); + rgb_color highColor = menu->HighColor(); frame.right -= 24; frame.left = frame.right - kBarWidth; frame.top += 5; @@ -97,7 +98,7 @@ NoiseBarMenuItem::DrawBar(bool force) r.right = fGrenze1; } if (r.left < r.right) { - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); // menu->SetHighColor(gUserColor); menu->FillRect(r); } @@ -112,7 +113,7 @@ NoiseBarMenuItem::DrawBar(bool force) menu->SetHighColor(kWhite); menu->FillRect(r); } - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); fGrenze1 = grenze1; fGrenze2 = grenze2; } diff --git a/src/apps/processcontroller/TeamBarMenuItem.cpp b/src/apps/processcontroller/TeamBarMenuItem.cpp index 82f7e31cb1..3f4a73e87e 100644 --- a/src/apps/processcontroller/TeamBarMenuItem.cpp +++ b/src/apps/processcontroller/TeamBarMenuItem.cpp @@ -123,6 +123,7 @@ TeamBarMenuItem::DrawBar(bool force) bool selected = IsSelected (); BRect frame = Frame(); BMenu* menu = Menu (); + rgb_color highColor = menu->HighColor(); frame.right -= 24; frame.left = frame.right-kBarWidth; frame.top += 5; @@ -209,7 +210,7 @@ TeamBarMenuItem::DrawBar(bool force) menu->FillRect(r); } - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); fGrenze1 = grenze1; fGrenze2 = grenze2; } diff --git a/src/apps/processcontroller/ThreadBarMenuItem.cpp b/src/apps/processcontroller/ThreadBarMenuItem.cpp index 94b2d1dd8c..8845dcb5ec 100644 --- a/src/apps/processcontroller/ThreadBarMenuItem.cpp +++ b/src/apps/processcontroller/ThreadBarMenuItem.cpp @@ -56,6 +56,7 @@ ThreadBarMenuItem::DrawBar(bool force) bool selected = IsSelected(); BRect frame = Frame(); BMenu* menu = Menu(); + rgb_color highColor = menu->HighColor(); frame.right -= 24; frame.left = frame.right - kBarWidth; frame.top += 3; @@ -127,7 +128,7 @@ ThreadBarMenuItem::DrawBar(bool force) menu->SetHighColor(kWhite); menu->FillRect(r); } - menu->SetHighColor(kBlack); + menu->SetHighColor(highColor); fGrenze1 = grenze1; fGrenze2 = grenze2; } diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp index 4cd5fca50c..32b2870b92 100644 --- a/src/preferences/filetypes/MimeTypeListView.cpp +++ b/src/preferences/filetypes/MimeTypeListView.cpp @@ -81,12 +81,11 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete) } if (fShowIcon) { - rgb_color highColor = owner->HighColor(); rgb_color lowColor = owner->LowColor(); if (IsSelected() || complete) { if (IsSelected()) - owner->SetLowColor(tint_color(lowColor, B_DARKEN_2_TINT)); + owner->SetLowColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR)); owner->FillRect(rect, B_SOLID_LOW); } @@ -112,10 +111,8 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete) owner->SetDrawingMode(B_OP_COPY); owner->MovePenTo(rect.left + B_MINI_ICON + 8.0f, frame.top + fBaselineOffset); - owner->SetHighColor(0, 0, 0); owner->DrawString(Text()); - owner->SetHighColor(highColor); owner->SetLowColor(lowColor); } else BStringItem::DrawItem(owner, rect, complete); diff --git a/src/preferences/media/MediaListItem.cpp b/src/preferences/media/MediaListItem.cpp index 8681e0c2ff..5d1b0967d4 100644 --- a/src/preferences/media/MediaListItem.cpp +++ b/src/preferences/media/MediaListItem.cpp @@ -76,11 +76,10 @@ struct MediaListItem::Renderer { { const rgb_color lowColor = onto->LowColor(); const rgb_color highColor = onto->HighColor(); - const rgb_color kBlack = {0, 0, 0, 255}; if (fSelected || complete) { if (fSelected) - onto->SetLowColor(tint_color(lowColor, B_DARKEN_2_TINT)); + onto->SetLowColor(ui_color(B_LIST_SELECTED_BACKGROUND_COLOR)); onto->FillRect(frame, B_SOLID_LOW); } @@ -105,7 +104,6 @@ struct MediaListItem::Renderer { } onto->SetDrawingMode(B_OP_COPY); - onto->SetHighColor(kBlack); BFont font = be_plain_font; font_height fontInfo; diff --git a/src/preferences/printers/JobListView.cpp b/src/preferences/printers/JobListView.cpp index 35eafb9672..81054a04c7 100644 --- a/src/preferences/printers/JobListView.cpp +++ b/src/preferences/printers/JobListView.cpp @@ -276,7 +276,7 @@ JobItem::DrawItem(BView *owner, BRect, bool complete) rgb_color oldHighColor = owner->HighColor(); if (IsSelected()) - color = tint_color(color, B_HIGHLIGHT_BACKGROUND_TINT); + color = ui_color(B_LIST_SELECTED_BACKGROUND_COLOR); owner->SetHighColor(color); owner->SetLowColor(color); diff --git a/src/preferences/printers/PrinterListView.cpp b/src/preferences/printers/PrinterListView.cpp index 04509356b8..012158c989 100644 --- a/src/preferences/printers/PrinterListView.cpp +++ b/src/preferences/printers/PrinterListView.cpp @@ -388,7 +388,7 @@ PrinterItem::DrawItem(BView *owner, BRect /*bounds*/, bool complete) rgb_color oldHighColor = owner->HighColor(); if (IsSelected()) - color = tint_color(color, B_HIGHLIGHT_BACKGROUND_TINT); + color = ui_color(B_LIST_SELECTED_BACKGROUND_COLOR); owner->SetLowColor(color); owner->SetHighColor(color);