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

User interface: Use user colors in menu and list items.

Browse Source 
* 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.
This commit is contained in:
Janus
2015-04-06 11:21:59 +00:00
parent 8e54273644
commit aa05612321
9 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/processcontroller/MemoryBarMenuItem.cpp
+7 -2
View File
@@ -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);
}