The real fix for taking anti-aliasing into account, though what my previous commit said was true as well.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12686 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-05-16 13:28:59 +00:00
parent 6d8d6cad9d
commit 5f50ffd65c
+5 -7
View File
@@ -155,18 +155,17 @@ BCheckBox::Draw(BRect updateRect)
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR)); SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
SetPenSize(2); SetPenSize(2);
// Yes, Haiku is differnt because of the anti-aliasing // Yes, Haiku is differnt because of the anti-aliasing
SetLowColor(lightenmax); SetDrawingMode(B_OP_OVER);
StrokeLine(BPoint(rect.left, rect.top), StrokeLine(BPoint(rect.left, rect.top),
BPoint(rect.right, rect.bottom)); BPoint(rect.right, rect.bottom));
StrokeLine(BPoint(rect.left, rect.bottom), StrokeLine(BPoint(rect.left, rect.bottom),
BPoint(rect.right, rect.top)); BPoint(rect.right, rect.top));
SetPenSize(1); SetPenSize(1);
SetDrawingMode(B_OP_COPY);
} }
// Label // Label
SetHighColor(darkenmax); SetHighColor(darkenmax);
// reset low color for text
SetLowColor(no_tint);
DrawString(Label(), BPoint((float)ceil(10.0f + fontHeight.ascent), DrawString(Label(), BPoint((float)ceil(10.0f + fontHeight.ascent),
3.0f + (float)ceil(fontHeight.ascent))); 3.0f + (float)ceil(fontHeight.ascent)));
@@ -208,20 +207,19 @@ SetLowColor(no_tint);
SetHighColor(tint_color(ui_color(B_KEYBOARD_NAVIGATION_COLOR), SetHighColor(tint_color(ui_color(B_KEYBOARD_NAVIGATION_COLOR),
B_DISABLED_MARK_TINT)); B_DISABLED_MARK_TINT));
// Yes, Haiku is differnt because of the anti-aliasing
SetLowColor(lightenmax);
SetPenSize(2); SetPenSize(2);
// Yes, Haiku is differnt because of the anti-aliasing
SetDrawingMode(B_OP_OVER);
StrokeLine(BPoint(rect.left, rect.top), StrokeLine(BPoint(rect.left, rect.top),
BPoint(rect.right, rect.bottom)); BPoint(rect.right, rect.bottom));
StrokeLine(BPoint(rect.left, rect.bottom), StrokeLine(BPoint(rect.left, rect.bottom),
BPoint(rect.right, rect.top)); BPoint(rect.right, rect.top));
SetPenSize(1); SetPenSize(1);
SetDrawingMode(B_OP_COPY);
} }
// Label // Label
SetHighColor(tint_color(no_tint, B_DISABLED_LABEL_TINT)); SetHighColor(tint_color(no_tint, B_DISABLED_LABEL_TINT));
// reset low color for text
SetLowColor(no_tint);
DrawString(Label(), BPoint((float)ceil(10.0f + fontHeight.ascent), DrawString(Label(), BPoint((float)ceil(10.0f + fontHeight.ascent),
3.0f + (float)ceil(fontHeight.ascent))); 3.0f + (float)ceil(fontHeight.ascent)));
} }