[haiku-commits] haiku: hrev44345 - src/preferences/appearance
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 16 Jul 2012 00:44:45 +0200 (CEST)
hrev44345 adds 1 changeset to branch 'master'
old head: 8c4773f75b06851586209f810ac1f8c759bf072f
new head: c3c5b8e8ae931ac99282a2cd84fbb2f563b60d7c
----------------------------------------------------------------------------
c3c5b8e: Update the Color Box border color in Appearance and put a TODO in.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44345
Commit: c3c5b8e8ae931ac99282a2cd84fbb2f563b60d7c
URL: http://cgit.haiku-os.org/haiku/commit/?id=c3c5b8e
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Sun Jul 15 21:36:03 2012 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 2 deletions(-)
src/preferences/appearance/ColorWhichItem.cpp | 8 ++++++--
----------------------------------------------------------------------------
diff --git a/src/preferences/appearance/ColorWhichItem.cpp
b/src/preferences/appearance/ColorWhichItem.cpp
index 23edda4..7da8529 100644
--- a/src/preferences/appearance/ColorWhichItem.cpp
+++ b/src/preferences/appearance/ColorWhichItem.cpp
@@ -40,19 +40,23 @@ ColorWhichItem::DrawItem(BView *owner, BRect frame, bool
complete)
owner->FillRect(frame);
}
- rgb_color black = {0, 0, 0, 255};
+ rgb_color border = (rgb_color){ 184, 184, 184, 255 };
BRect colorRect(frame);
colorRect.InsetBy(2, 2);
colorRect.right = colorRect.left + colorRect.Height();
owner->SetHighColor(fColor);
owner->FillRect(colorRect);
- owner->SetHighColor(black);
+ owner->SetHighColor(border);
owner->StrokeRect(colorRect);
owner->MovePenTo(frame.left + colorRect.Width() + 8, frame.top
+ BaselineOffset());
+ // TODO: Don't hardcode black here, calculate based on background
+ // color or use B_CONTROL_TEXT_COLOR constant.
+ rgb_color black = (rgb_color){ 0, 0, 0, 255 };
+
if (!IsEnabled())
owner->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
else
Other related posts:
