i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app_sever: Fix more mixups of transformed clipping bounds

Browse Source
This commit is contained in:
Stephan Aßmus
2014-05-23 21:03:33 +02:00
parent 81507fa496
commit d30a0a6eae
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/DrawingEngine.cpp
+31 -27
View File
@@ -974,8 +974,7 @@ DrawingEngine::FillRect(BRect r)
bool doInSoftware = true; bool doInSoftware = true;
if (fPainter->IsIdentityTransform()) if (fPainter->IsIdentityTransform()) {
{
// TODO the accelerated code path may also be used for transforms that // TODO the accelerated code path may also be used for transforms that
// only scale and translate (but don't shear or rotate). // only scale and translate (but don't shear or rotate).
@@ -1052,32 +1051,36 @@ DrawingEngine::FillRegion(BRegion& r)
AutoFloatingOverlaysHider overlaysHider(fGraphicsCard, clipped); AutoFloatingOverlaysHider overlaysHider(fGraphicsCard, clipped);
bool doInSoftware = true; bool doInSoftware = true;
// try hardware optimized version first
if ((fAvailableHWAccleration & HW_ACC_FILL_REGION) != 0) { if (fPainter->IsIdentityTransform()) {
if (fPainter->Pattern() == B_SOLID_HIGH // try hardware optimized version first
&& (fPainter->DrawingMode() == B_OP_COPY if ((fAvailableHWAccleration & HW_ACC_FILL_REGION) != 0) {
|| fPainter->DrawingMode() == B_OP_OVER)) { if (fPainter->Pattern() == B_SOLID_HIGH
&& (fPainter->DrawingMode() == B_OP_COPY
|| fPainter->DrawingMode() == B_OP_OVER)) {
r.IntersectWith(fPainter->ClippingRegion());
fGraphicsCard->FillRegion(r, fPainter->HighColor(),
fSuspendSyncLevel == 0 || overlaysHider.WasHidden());
doInSoftware = false;
} else if (fPainter->Pattern() == B_SOLID_LOW
&& fPainter->DrawingMode() == B_OP_COPY) {
r.IntersectWith(fPainter->ClippingRegion());
fGraphicsCard->FillRegion(r, fPainter->LowColor(),
fSuspendSyncLevel == 0 || overlaysHider.WasHidden());
doInSoftware = false;
}
}
if (doInSoftware
&& (fAvailableHWAccleration & HW_ACC_INVERT_REGION) != 0
&& fPainter->Pattern() == B_SOLID_HIGH
&& fPainter->DrawingMode() == B_OP_INVERT) {
r.IntersectWith(fPainter->ClippingRegion()); r.IntersectWith(fPainter->ClippingRegion());
fGraphicsCard->FillRegion(r, fPainter->HighColor(), fGraphicsCard->InvertRegion(r);
fSuspendSyncLevel == 0 || overlaysHider.WasHidden());
doInSoftware = false;
} else if (fPainter->Pattern() == B_SOLID_LOW
&& fPainter->DrawingMode() == B_OP_COPY) {
r.IntersectWith(fPainter->ClippingRegion());
fGraphicsCard->FillRegion(r, fPainter->LowColor(),
fSuspendSyncLevel == 0 || overlaysHider.WasHidden());
doInSoftware = false; doInSoftware = false;
} }
} }
if (doInSoftware && (fAvailableHWAccleration & HW_ACC_INVERT_REGION) != 0
&& fPainter->Pattern() == B_SOLID_HIGH
&& fPainter->DrawingMode() == B_OP_INVERT) {
r.IntersectWith(fPainter->ClippingRegion());
fGraphicsCard->InvertRegion(r);
doInSoftware = false;
}
if (doInSoftware) { if (doInSoftware) {
BRect touched = fPainter->FillRect(r.RectAt(0)); BRect touched = fPainter->FillRect(r.RectAt(0));
@@ -1095,7 +1098,7 @@ DrawingEngine::FillRegion(BRegion& r, const BGradient& gradient)
{ {
ASSERT_PARALLEL_LOCKED(); ASSERT_PARALLEL_LOCKED();
BRect clipped = fPainter->ClipRect(r.Frame()); BRect clipped = fPainter->TransformAndClipRect(r.Frame());
if (!clipped.IsValid()) if (!clipped.IsValid())
return; return;
@@ -1172,7 +1175,7 @@ DrawingEngine::DrawShape(const BRect& bounds, int32 opCount,
// BRect clipped(bounds); // BRect clipped(bounds);
// if (!filled) // if (!filled)
// extend_by_stroke_width(clipped, fPainter->PenSize()); // extend_by_stroke_width(clipped, fPainter->PenSize());
// clipped = fPainter->ClipRect(bounds); // clipped = fPainter->TransformAndClipRect(bounds);
// //
// clipped.left = floorf(clipped.left); // clipped.left = floorf(clipped.left);
// clipped.top = floorf(clipped.top); // clipped.top = floorf(clipped.top);
@@ -1201,7 +1204,7 @@ DrawingEngine::FillShape(const BRect& bounds, int32 opCount,
ASSERT_PARALLEL_LOCKED(); ASSERT_PARALLEL_LOCKED();
// TODO: bounds probably does not take curves and arcs into account... // TODO: bounds probably does not take curves and arcs into account...
// BRect clipped = fPainter->ClipRect(bounds); // BRect clipped = fPainter->TransformAndClipRect(bounds);
// //
// clipped.left = floorf(clipped.left); // clipped.left = floorf(clipped.left);
// clipped.top = floorf(clipped.top); // clipped.top = floorf(clipped.top);
@@ -1347,7 +1350,8 @@ DrawingEngine::DrawString(const char* string, int32 length,
BPoint penLocation = pt; BPoint penLocation = pt;
// try a fast clipping path // try a fast clipping path
if (fPainter->ClippingRegion() && fPainter->Font().Rotation() == 0.0f if (fPainter->ClippingRegion() != NULL
&& fPainter->Font().Rotation() == 0.0f
&& fPainter->IsIdentityTransform()) { && fPainter->IsIdentityTransform()) {
float fontSize = fPainter->Font().Size(); float fontSize = fPainter->Font().Size();
BRect clippingFrame = fPainter->ClippingRegion()->Frame(); BRect clippingFrame = fPainter->ClippingRegion()->Frame();