From dfd2e47c90e448fe5955d1b3b5f4aa1fb1deb42d Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Wed, 28 Jan 2004 02:07:28 +0000 Subject: [PATCH] Updated sources to remove Pattern parameter from DisplayDriver function calls git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6384 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/DisplayDriver.cpp | 80 ++++++++++++++++-------- src/servers/app/server/PicturePlayer.cpp | 26 ++++---- src/servers/app/server/ViewDriver.h | 1 - 3 files changed, 68 insertions(+), 39 deletions(-) diff --git a/src/servers/app/server/DisplayDriver.cpp b/src/servers/app/server/DisplayDriver.cpp index 724b5801a6..66cef6c3d4 100644 --- a/src/servers/app/server/DisplayDriver.cpp +++ b/src/servers/app/server/DisplayDriver.cpp @@ -336,8 +336,7 @@ void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &spa { } -void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &span, - const DrawData *d, const Pattern& pattern) +void DisplayDriver::FillArc(const BRect &r, const float &angle, const float &span, const DrawData *d) { } @@ -721,7 +720,7 @@ void DisplayDriver::FillBezier(BPoint *pts, RGBColor &color) { } -void DisplayDriver::FillBezier(BPoint *pts, const DrawData *d, const Pattern &pattern) +void DisplayDriver::FillBezier(BPoint *pts, const DrawData *d) { } @@ -809,7 +808,7 @@ void DisplayDriver::FillEllipse(const BRect &r, RGBColor &color) { } -void DisplayDriver::FillEllipse(const BRect &r, const DrawData *d, const Pattern &pattern) +void DisplayDriver::FillEllipse(const BRect &r, const DrawData *d) { } @@ -883,7 +882,7 @@ void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, RGBColor &color) { } -void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, const DrawData *d, const Pattern &pattern) +void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, const DrawData *d) { } @@ -1022,6 +1021,9 @@ void DisplayDriver::FillPolygon(BPoint *ptlist, int32 numpts, DisplayDriver* dri */ void DisplayDriver::FillRect(const BRect &r, RGBColor &color) { + Lock(); + FillSolidRect(r,color); + Unlock(); } /*! @@ -1031,8 +1033,11 @@ void DisplayDriver::FillRect(const BRect &r, RGBColor &color) \param high_color The high color of the pattern \param low_color The low color of the pattern */ -void DisplayDriver::FillRect(const BRect &r, const DrawData *d, const Pattern &pattern) +void DisplayDriver::FillRect(const BRect &r, const DrawData *d) { + Lock(); + FillPatternRect(r,d); + Unlock(); } /*! @@ -1057,7 +1062,7 @@ void DisplayDriver::FillRegion(BRegion& r, RGBColor &color) \param high_color The high color of the pattern \param low_color The low color of the pattern */ -void DisplayDriver::FillRegion(BRegion& r, const DrawData *d, const Pattern &pattern) +void DisplayDriver::FillRegion(BRegion& r, const DrawData *d) { if(!d) return; @@ -1065,7 +1070,7 @@ void DisplayDriver::FillRegion(BRegion& r, const DrawData *d, const Pattern &pat Lock(); for(int32 i=0; iStrokeLine(start,end,&fldata,stipplepat); + fdriver->StrokeLine(start,end,&fldata); break; } case B_PIC_STROKE_RECT: { BRect rect = GetRect(); - fdriver->StrokeRect(rect,&fldata,stipplepat); + fdriver->StrokeRect(rect,&fldata); break; } case B_PIC_FILL_RECT: { BRect rect = GetRect(); - fdriver->FillRect(rect,&fldata,stipplepat); + fdriver->FillRect(rect,&fldata); break; } case B_PIC_STROKE_ROUND_RECT: { BRect rect = GetRect(); BPoint radii = GetCoord(); - fdriver->StrokeRoundRect(rect,radii.x,radii.y,&fldata,stipplepat); + fdriver->StrokeRoundRect(rect,radii.x,radii.y,&fldata); break; } case B_PIC_FILL_ROUND_RECT: { BRect rect = GetRect(); BPoint radii = GetCoord(); - fdriver->FillRoundRect(rect,radii.x,radii.y,&fldata,stipplepat); + fdriver->FillRoundRect(rect,radii.x,radii.y,&fldata); break; } case B_PIC_STROKE_BEZIER: { BPoint control[4]; GetData(control, sizeof(control)); - fdriver->StrokeBezier(control,&fldata,stipplepat); + fdriver->StrokeBezier(control,&fldata); break; } case B_PIC_FILL_BEZIER: { BPoint control[4]; GetData(control, sizeof(control)); - fdriver->FillBezier(control,&fldata,stipplepat); + fdriver->FillBezier(control,&fldata); break; } case B_PIC_STROKE_POLYGON: @@ -202,7 +202,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) BPoint *points = new BPoint[numPoints]; GetData(points, numPoints * sizeof(BPoint)); bool isClosed = GetBool(); - fdriver->StrokePolygon(points,numPoints,&fldata,stipplepat,isClosed); + fdriver->StrokePolygon(points,numPoints,&fldata,isClosed); delete points; break; } @@ -211,7 +211,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) int32 numPoints = GetInt32(); BPoint *points = new BPoint[numPoints]; GetData(points, numPoints * sizeof(BPoint)); - fdriver->FillPolygon(points,numPoints,&fldata,stipplepat); + fdriver->FillPolygon(points,numPoints,&fldata); delete points; break; } @@ -268,7 +268,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) float startTheta = GetFloat(); float arcTheta = GetFloat(); fdriver->StrokeArc(BRect(center.x-radii.x,center.y-radii.y,center.x+radii.x, - center.y+radii.y),startTheta, arcTheta, &fldata,stipplepat); + center.y+radii.y),startTheta, arcTheta, &fldata); break; } case B_PIC_FILL_ARC: @@ -278,7 +278,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) float startTheta = GetFloat(); float arcTheta = GetFloat(); fdriver->FillArc(BRect(center.x-radii.x,center.y-radii.y,center.x+radii.x, - center.y+radii.y),startTheta, arcTheta, &fldata, stipplepat); + center.y+radii.y),startTheta, arcTheta, &fldata); break; } case B_PIC_STROKE_ELLIPSE: @@ -287,7 +287,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) BPoint center; BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f); center = rect.LeftTop() + radii; - fdriver->StrokeEllipse(rect,&fldata,stipplepat); + fdriver->StrokeEllipse(rect,&fldata); break; } case B_PIC_FILL_ELLIPSE: @@ -296,7 +296,7 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d) BPoint center; BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f); center = rect.LeftTop() + radii; - fdriver->FillEllipse(rect,&fldata,stipplepat); + fdriver->FillEllipse(rect,&fldata); break; } case B_PIC_ENTER_STATE_CHANGE: diff --git a/src/servers/app/server/ViewDriver.h b/src/servers/app/server/ViewDriver.h index a15df812c8..27b45372ff 100644 --- a/src/servers/app/server/ViewDriver.h +++ b/src/servers/app/server/ViewDriver.h @@ -110,7 +110,6 @@ public: void InvertRect(const BRect &r); - virtual void StrokeLineArray(BPoint *pts, const int32 &numlines, const DrawData *d, RGBColor *colors); void SetMode(const int32 &mode);