From 20863175a0a48640364e750dc4fc81c2f528b95d Mon Sep 17 00:00:00 2001
From: Janus <janus2@ymail.com>
Date: Wed, 18 Mar 2015 22:41:48 +0000
Subject: [PATCH] Use user color for selected menuItem in ProcessController
---
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 ++-
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
index 8b7772b..30b5fe0 100644
a
|
b
|
KernelMemoryBarMenuItem::DrawBar(bool force)
|
70 | 70 | bool selected = IsSelected(); |
71 | 71 | BRect frame = Frame(); |
72 | 72 | BMenu* menu = Menu(); |
| 73 | rgb_color highColor = menu->HighColor(); |
73 | 74 | |
74 | 75 | // draw the bar itself |
75 | 76 | BRect cadre (frame.right - kMargin - kBarWidth, frame.top + 5, |
… |
… |
KernelMemoryBarMenuItem::DrawBar(bool force)
|
133 | 134 | menu->SetHighColor(kWhite); |
134 | 135 | menu->FillRect(r); |
135 | 136 | } |
136 | | menu->SetHighColor(kBlack); |
| 137 | menu->SetHighColor(highColor); |
137 | 138 | fGrenze1 = grenze1; |
138 | 139 | fGrenze2 = grenze2; |
139 | 140 | |
… |
… |
KernelMemoryBarMenuItem::DrawBar(bool force)
|
150 | 151 | BRect trect(cadre.left - kMargin - gMemoryTextWidth, frame.top, |
151 | 152 | cadre.left - kMargin, frame.bottom); |
152 | 153 | menu->FillRect(trect); |
153 | | menu->SetHighColor(kBlack); |
| 154 | menu->SetHighColor(highColor); |
154 | 155 | |
155 | 156 | char infos[128]; |
156 | 157 | string_for_size(fCachedMemory * 1024.0, infos, sizeof(infos)); |
diff --git a/src/apps/processcontroller/MemoryBarMenuItem.cpp b/src/apps/processcontroller/MemoryBarMenuItem.cpp
index bd5ccb7..d8d087f 100644
a
|
b
|
MemoryBarMenuItem::DrawBar(bool force)
|
114 | 114 | bool selected = IsSelected(); |
115 | 115 | BRect frame = Frame(); |
116 | 116 | BMenu* menu = Menu(); |
| 117 | rgb_color highColor = menu->HighColor(); |
117 | 118 | |
118 | 119 | // draw the bar itself |
119 | 120 | |
… |
… |
MemoryBarMenuItem::DrawBar(bool force)
|
186 | 187 | menu->FillRect(r); |
187 | 188 | } |
188 | 189 | |
189 | | menu->SetHighColor(kBlack); |
| 190 | menu->SetHighColor(highColor); |
190 | 191 | fGrenze1 = grenze1; |
191 | 192 | fGrenze2 = grenze2; |
192 | 193 | |
… |
… |
MemoryBarMenuItem::DrawBar(bool force)
|
210 | 211 | fLastWrite = fWriteMemory; |
211 | 212 | fLastAll = fAllMemory; |
212 | 213 | |
213 | | menu->SetHighColor(kBlack); |
| 214 | if (selected) |
| 215 | menu->SetHighColor(ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR)); |
| 216 | else |
| 217 | menu->SetHighColor(ui_color(B_MENU_ITEM_TEXT_COLOR)); |
214 | 218 | |
215 | 219 | char infos[128]; |
216 | 220 | string_for_size(fWriteMemory * 1024.0, infos, sizeof(infos)); |
… |
… |
MemoryBarMenuItem::DrawBar(bool force)
|
222 | 226 | string_for_size(fAllMemory * 1024.0, infos, sizeof(infos)); |
223 | 227 | loc.x = rect.left - kMargin - menu->StringWidth(infos); |
224 | 228 | menu->DrawString(infos, loc); |
| 229 | menu->SetHighColor(highColor); |
225 | 230 | } |
226 | 231 | |
227 | 232 | |
diff --git a/src/apps/processcontroller/NoiseBarMenuItem.cpp b/src/apps/processcontroller/NoiseBarMenuItem.cpp
index 5f53807..9446a06 100644
a
|
b
|
NoiseBarMenuItem::DrawBar(bool force)
|
51 | 51 | bool selected = IsSelected(); |
52 | 52 | BRect frame = Frame(); |
53 | 53 | BMenu* menu = Menu(); |
| 54 | rgb_color highColor = menu->HighColor(); |
54 | 55 | frame.right -= 24; |
55 | 56 | frame.left = frame.right - kBarWidth; |
56 | 57 | frame.top += 5; |
… |
… |
NoiseBarMenuItem::DrawBar(bool force)
|
97 | 98 | r.right = fGrenze1; |
98 | 99 | } |
99 | 100 | if (r.left < r.right) { |
100 | | menu->SetHighColor(kBlack); |
| 101 | menu->SetHighColor(highColor); |
101 | 102 | // menu->SetHighColor(gUserColor); |
102 | 103 | menu->FillRect(r); |
103 | 104 | } |
… |
… |
NoiseBarMenuItem::DrawBar(bool force)
|
112 | 113 | menu->SetHighColor(kWhite); |
113 | 114 | menu->FillRect(r); |
114 | 115 | } |
115 | | menu->SetHighColor(kBlack); |
| 116 | menu->SetHighColor(highColor); |
116 | 117 | fGrenze1 = grenze1; |
117 | 118 | fGrenze2 = grenze2; |
118 | 119 | } |
diff --git a/src/apps/processcontroller/TeamBarMenuItem.cpp b/src/apps/processcontroller/TeamBarMenuItem.cpp
index 82f7e31..3f4a73e 100644
a
|
b
|
TeamBarMenuItem::DrawBar(bool force)
|
123 | 123 | bool selected = IsSelected (); |
124 | 124 | BRect frame = Frame(); |
125 | 125 | BMenu* menu = Menu (); |
| 126 | rgb_color highColor = menu->HighColor(); |
126 | 127 | frame.right -= 24; |
127 | 128 | frame.left = frame.right-kBarWidth; |
128 | 129 | frame.top += 5; |
… |
… |
TeamBarMenuItem::DrawBar(bool force)
|
209 | 210 | menu->FillRect(r); |
210 | 211 | } |
211 | 212 | |
212 | | menu->SetHighColor(kBlack); |
| 213 | menu->SetHighColor(highColor); |
213 | 214 | fGrenze1 = grenze1; |
214 | 215 | fGrenze2 = grenze2; |
215 | 216 | } |
diff --git a/src/apps/processcontroller/ThreadBarMenuItem.cpp b/src/apps/processcontroller/ThreadBarMenuItem.cpp
index 94b2d1d..8845dcb 100644
a
|
b
|
ThreadBarMenuItem::DrawBar(bool force)
|
56 | 56 | bool selected = IsSelected(); |
57 | 57 | BRect frame = Frame(); |
58 | 58 | BMenu* menu = Menu(); |
| 59 | rgb_color highColor = menu->HighColor(); |
59 | 60 | frame.right -= 24; |
60 | 61 | frame.left = frame.right - kBarWidth; |
61 | 62 | frame.top += 3; |
… |
… |
ThreadBarMenuItem::DrawBar(bool force)
|
127 | 128 | menu->SetHighColor(kWhite); |
128 | 129 | menu->FillRect(r); |
129 | 130 | } |
130 | | menu->SetHighColor(kBlack); |
| 131 | menu->SetHighColor(highColor); |
131 | 132 | fGrenze1 = grenze1; |
132 | 133 | fGrenze2 = grenze2; |
133 | 134 | } |