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

app_server: Fix clipping computation in DrawArc

Browse Source 
The clipped rect was extended with the stroke width, and then the result
was overwritten.

Fixes #3130.
This commit is contained in:
Adrien Destugues
2020-07-12 13:11:11 +02:00
parent c97647019c
commit 4ad808b67d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/DrawingEngine.cpp
+3 -6
View File
@@ -649,12 +649,11 @@ DrawingEngine::DrawArc(BRect r, const float& angle, const float& span,
make_rect_valid(r); make_rect_valid(r);
fPainter->AlignEllipseRect(&r, filled); fPainter->AlignEllipseRect(&r, filled);
BRect clipped(r);
if (!filled) if (!filled)
extend_by_stroke_width(clipped, fPainter->PenSize()); extend_by_stroke_width(r, fPainter->PenSize());
clipped = fPainter->TransformAndClipRect(r); BRect clipped(fPainter->TransformAndClipRect(r));
if (clipped.IsValid()) { if (clipped.IsValid()) {
AutoFloatingOverlaysHider _(fGraphicsCard, clipped); AutoFloatingOverlaysHider _(fGraphicsCard, clipped);
@@ -682,9 +681,7 @@ DrawingEngine::FillArc(BRect r, const float& angle, const float& span,
make_rect_valid(r); make_rect_valid(r);
fPainter->AlignEllipseRect(&r, true); fPainter->AlignEllipseRect(&r, true);
BRect clipped(r); BRect clipped(fPainter->TransformAndClipRect(r));
clipped = fPainter->TransformAndClipRect(r);
if (clipped.IsValid()) { if (clipped.IsValid()) {
AutoFloatingOverlaysHider _(fGraphicsCard, clipped); AutoFloatingOverlaysHider _(fGraphicsCard, clipped);