fixed MiniTerminal rendering
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12149 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -297,13 +297,12 @@ Painter::StrokeLine(BPoint a, BPoint b, const pattern& p)
|
|||||||
float penSize = _Transform(fPenSize);
|
float penSize = _Transform(fPenSize);
|
||||||
if (penSize == 1.0 &&
|
if (penSize == 1.0 &&
|
||||||
(fDrawingMode == B_OP_COPY || fDrawingMode == B_OP_OVER)) {
|
(fDrawingMode == B_OP_COPY || fDrawingMode == B_OP_OVER)) {
|
||||||
// TODO: fix me
|
pattern pat = *fPatternHandler->GetR5Pattern();
|
||||||
// pattern p = *fPatternHandler->GetR5Pattern();
|
if (pat == B_SOLID_HIGH &&
|
||||||
if (p == B_SOLID_HIGH &&
|
|
||||||
StraightLine(a, b, fPatternHandler->HighColor().GetColor32())) {
|
StraightLine(a, b, fPatternHandler->HighColor().GetColor32())) {
|
||||||
SetPenLocation(b);
|
SetPenLocation(b);
|
||||||
return;
|
return;
|
||||||
} else if (p == B_SOLID_LOW &&
|
} else if (pat == B_SOLID_LOW &&
|
||||||
StraightLine(a, b, fPatternHandler->LowColor().GetColor32())) {
|
StraightLine(a, b, fPatternHandler->LowColor().GetColor32())) {
|
||||||
SetPenLocation(b);
|
SetPenLocation(b);
|
||||||
return;
|
return;
|
||||||
@@ -550,12 +549,11 @@ Painter::FillRect(const BRect& r, const pattern& p) const
|
|||||||
|
|
||||||
// first, try an optimized version
|
// first, try an optimized version
|
||||||
if (fDrawingMode == B_OP_COPY || fDrawingMode == B_OP_OVER) {
|
if (fDrawingMode == B_OP_COPY || fDrawingMode == B_OP_OVER) {
|
||||||
// TODO: fix me
|
pattern pat = *fPatternHandler->GetR5Pattern();
|
||||||
// pattern p = *fPatternHandler->GetR5Pattern();
|
if (pat == B_SOLID_HIGH) {
|
||||||
if (p == B_SOLID_HIGH) {
|
|
||||||
FillRect(BRect(a, b), fPatternHandler->HighColor().GetColor32());
|
FillRect(BRect(a, b), fPatternHandler->HighColor().GetColor32());
|
||||||
return;
|
return;
|
||||||
} else if (p == B_SOLID_LOW) {
|
} else if (pat == B_SOLID_LOW) {
|
||||||
FillRect(BRect(a, b), fPatternHandler->LowColor().GetColor32());
|
FillRect(BRect(a, b), fPatternHandler->LowColor().GetColor32());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user