[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: Teammonitor: Respect system colors
From: Gerrit <review () review ! haiku-os ! org>
Date: 2020-09-22 18:35:27
Message-ID: gerrit.1600799726000.I5cc69376ade425c46bc76f8179f93bb74428da68 () review ! haiku-os ! org
[Download RAW message or body]
From Adrien Destugues <pulkomandy@gmail.com>:
Adrien Destugues has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/3261 )
Change subject: Teammonitor: Respect system colors
......................................................................
Teammonitor: Respect system colors
---
M src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
1 file changed, 25 insertions(+), 25 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/61/3261/1
diff --git a/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp \
b/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp index 20f2264..52f947a \
100644
--- a/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp
@@ -66,26 +66,23 @@
void
TeamListItem::DrawItem(BView* owner, BRect frame, bool complete)
{
- rgb_color kHighlight = { 140, 140, 140, 0 };
- rgb_color kBlack = { 0, 0, 0, 0 };
- rgb_color kBlue = { 0, 0, 255, 0 };
- rgb_color kRed = { 255, 0, 0, 0 };
+ rgb_color kHighlight = ui_color(B_LIST_SELECTED_BACKGROUND_COLOR);
+ rgb_color kHighlightText = ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR);
+ rgb_color kText = ui_color(B_LIST_ITEM_TEXT_COLOR);
+
+ rgb_color kIdealRed = { 255, 0, 0, 0 };
+ rgb_color kIdealBlue = { 0, 0, 255, 0 };
+ rgb_color kRed = mix_color(kIdealRed, kText, 191);
+ rgb_color kBlue = mix_color(kIdealBlue, kText, 191);
+ rgb_color kHighlightRed = mix_color(kIdealRed, kHighlightText, 191);
+ rgb_color kHighlightBlue = mix_color(kIdealBlue, kHighlightText, 191);
BRect r(frame);
if (IsSelected() || complete) {
- rgb_color color;
- if (IsSelected())
- color = kHighlight;
- else
- color = owner->ViewColor();
-
- owner->SetHighColor(color);
- owner->SetLowColor(color);
+ owner->SetHighColor(kHighlight);
+ owner->SetLowColor(kHighlight);
owner->FillRect(r);
- owner->SetHighColor(kBlack);
- } else {
- owner->SetLowColor(owner->ViewColor());
}
frame.left += 4;
@@ -99,10 +96,13 @@
frame.left += 16;
if (fRefusingToQuit)
- owner->SetHighColor(kRed);
- else
- owner->SetHighColor(IsSystemServer() ? kBlue : kBlack);
-
+ owner->SetHighColor(IsSelected() ? kHighlightRed : kRed);
+ else {
+ if (IsSystemServer())
+ owner->SetHighColor(IsSelected() ? kHighlightBlue : kBlue);
+ else
+ owner->SetHighColor(IsSelected() ? kHighlightText : kText);
+ }
BFont font = be_plain_font;
font_height finfo;
font.GetHeight(&finfo);
@@ -150,19 +150,19 @@
static BPath systemServersPath;
static BPath trackerPath;
static BPath deskbarPath;
-
+
if (firstCall) {
find_directory(B_SYSTEM_SERVERS_DIRECTORY, &systemServersPath);
find_directory(B_SYSTEM_DIRECTORY, &trackerPath);
trackerPath.Append("Tracker");
-
+
find_directory(B_SYSTEM_DIRECTORY, &deskbarPath);
deskbarPath.Append("Deskbar");
-
+
firstCall = false;
}
-
+
if (strncmp(systemServersPath.Path(), fTeamInfo.args,
strlen(systemServersPath.Path())) == 0)
return true;
@@ -174,8 +174,8 @@
if (strncmp(deskbarPath.Path(), fTeamInfo.args,
strlen(deskbarPath.Path())) == 0)
return true;
-
- return false;
+
+ return false;
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3261
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I5cc69376ade425c46bc76f8179f93bb74428da68
Gerrit-Change-Number: 3261
Gerrit-PatchSet: 1
Gerrit-Owner: Adrien Destugues <pulkomandy@gmail.com>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>Adrien Destugues has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/3261">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">Teammonitor: Respect \
system colors<br>---<br>M \
src/add-ons/input_server/devices/keyboard/TeamListItem.cpp<br>1 file changed, 25 \
insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: \
monospace,monospace; white-space: pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku \
refs/changes/61/3261/1</pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;"><span>diff --git \
a/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp \
b/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp</span><br><span>index \
20f2264..52f947a 100644</span><br><span>--- \
a/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp</span><br><span>+++ \
b/src/add-ons/input_server/devices/keyboard/TeamListItem.cpp</span><br><span>@@ \
-66,26 +66,23 @@</span><br><span> void</span><br><span> TeamListItem::DrawItem(BView* \
owner, BRect frame, bool complete)</span><br><span> {</span><br><span style="color: \
hsl(0, 100%, 40%);">- rgb_color kHighlight = { 140, 140, 140, 0 };</span><br><span \
style="color: hsl(0, 100%, 40%);">- rgb_color kBlack = { 0, 0, 0, 0 \
};</span><br><span style="color: hsl(0, 100%, 40%);">- rgb_color kBlue = { 0, 0, 255, \
0 };</span><br><span style="color: hsl(0, 100%, 40%);">- rgb_color kRed = { 255, 0, \
0, 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ rgb_color kHighlight = \
ui_color(B_LIST_SELECTED_BACKGROUND_COLOR);</span><br><span style="color: hsl(120, \
100%, 40%);">+ rgb_color kHighlightText = \
ui_color(B_LIST_SELECTED_ITEM_TEXT_COLOR);</span><br><span style="color: hsl(120, \
100%, 40%);">+ rgb_color kText = ui_color(B_LIST_ITEM_TEXT_COLOR);</span><br><span \
style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, \
40%);">+ rgb_color kIdealRed = { 255, 0, 0, 0 };</span><br><span style="color: \
hsl(120, 100%, 40%);">+ rgb_color kIdealBlue = { 0, 0, 255, 0 };</span><br><span \
style="color: hsl(120, 100%, 40%);">+ rgb_color kRed = mix_color(kIdealRed, kText, \
191);</span><br><span style="color: hsl(120, 100%, 40%);">+ rgb_color kBlue = \
mix_color(kIdealBlue, kText, 191);</span><br><span style="color: hsl(120, 100%, \
40%);">+ rgb_color kHighlightRed = mix_color(kIdealRed, kHighlightText, \
191);</span><br><span style="color: hsl(120, 100%, 40%);">+ rgb_color kHighlightBlue \
= mix_color(kIdealBlue, kHighlightText, 191);</span><br><span> </span><br><span> \
BRect r(frame);</span><br><span> </span><br><span> if (IsSelected() || complete) \
{</span><br><span style="color: hsl(0, 100%, 40%);">- rgb_color \
color;</span><br><span style="color: hsl(0, 100%, 40%);">- if \
(IsSelected())</span><br><span style="color: hsl(0, 100%, 40%);">- color = \
kHighlight;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span \
style="color: hsl(0, 100%, 40%);">- color = owner->ViewColor();</span><br><span \
style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetHighColor(color);</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetLowColor(color);</span><br><span style="color: hsl(120, 100%, \
40%);">+ owner->SetHighColor(kHighlight);</span><br><span style="color: hsl(120, \
100%, 40%);">+ owner->SetLowColor(kHighlight);</span><br><span> \
owner->FillRect(r);</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetHighColor(kBlack);</span><br><span style="color: hsl(0, 100%, \
40%);">- } else {</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetLowColor(owner->ViewColor());</span><br><span> \
}</span><br><span> </span><br><span> frame.left += 4;</span><br><span>@@ -99,10 \
+96,13 @@</span><br><span> </span><br><span> frame.left += 16;</span><br><span> if \
(fRefusingToQuit)</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetHighColor(kRed);</span><br><span style="color: hsl(0, 100%, \
40%);">- else</span><br><span style="color: hsl(0, 100%, \
40%);">- owner->SetHighColor(IsSystemServer() ? kBlue : kBlack);</span><br><span \
style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, \
40%);">+ owner->SetHighColor(IsSelected() ? kHighlightRed : \
kRed);</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span \
style="color: hsl(120, 100%, 40%);">+ if (IsSystemServer())</span><br><span \
style="color: hsl(120, 100%, 40%);">+ owner->SetHighColor(IsSelected() ? \
kHighlightBlue : kBlue);</span><br><span style="color: hsl(120, 100%, \
40%);">+ else</span><br><span style="color: hsl(120, 100%, \
40%);">+ owner->SetHighColor(IsSelected() ? kHighlightText : \
kText);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> \
BFont font = be_plain_font;</span><br><span> font_height finfo;</span><br><span> \
font.GetHeight(&finfo);</span><br><span>@@ -150,19 +150,19 @@</span><br><span> \
static BPath systemServersPath;</span><br><span> static BPath \
trackerPath;</span><br><span> static BPath deskbarPath;</span><br><span \
style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, \
40%);">+</span><br><span> if (firstCall) {</span><br><span> \
find_directory(B_SYSTEM_SERVERS_DIRECTORY, &systemServersPath);</span><br><span> \
</span><br><span> find_directory(B_SYSTEM_DIRECTORY, \
&trackerPath);</span><br><span> \
trackerPath.Append("Tracker");</span><br><span style="color: hsl(0, 100%, \
40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> \
find_directory(B_SYSTEM_DIRECTORY, &deskbarPath);</span><br><span> \
deskbarPath.Append("Deskbar");</span><br><span style="color: hsl(0, 100%, \
40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> \
firstCall = false;</span><br><span> }</span><br><span style="color: hsl(0, 100%, \
40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if \
(strncmp(systemServersPath.Path(), fTeamInfo.args,</span><br><span> \
strlen(systemServersPath.Path())) == 0)</span><br><span> return \
true;</span><br><span>@@ -174,8 +174,8 @@</span><br><span> if \
(strncmp(deskbarPath.Path(), fTeamInfo.args,</span><br><span> \
strlen(deskbarPath.Path())) == 0)</span><br><span> return true;</span><br><span \
style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, \
40%);">- return false; </span><br><span style="color: hsl(120, 100%, \
40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return \
false;</span><br><span> }</span><br><span> </span><br><span> \
</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/3261">change 3261</a>. To unsubscribe, or \
for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="about:invalid#zSoyz"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I5cc69376ade425c46bc76f8179f93bb74428da68 </div> <div style="display:none"> \
Gerrit-Change-Number: 3261 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: Adrien Destugues \
<pulkomandy@gmail.com> </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic