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

Rearranged attachment protocols for Stroke/Fill Arc and Ellipse

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8952 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-09-14 22:20:16 +00:00
parent 3901fa14bf
commit 0ea7755d28
1 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/View.cpp
+44 -56
View File
@@ -2323,17 +2323,10 @@ void BView::DrawString(const char* aString, int32 length, BPoint location,
void BView::StrokeEllipse(BPoint center, float xRadius, float yRadius, void BView::StrokeEllipse(BPoint center, float xRadius, float yRadius,
pattern p) pattern p)
{ {
if (owner) if(owner)
{ {
check_lock(); StrokeEllipse( BRect(center.x-xRadius, center.y-yRadius, center.x+xRadius,
center.y+yRadius), p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_STROKE_ELLIPSE );
owner->fLink->Attach<BPoint>( center );
owner->fLink->Attach<float>( xRadius );
owner->fLink->Attach<float>( yRadius );
} }
} }
@@ -2343,8 +2336,13 @@ void BView::StrokeEllipse(BRect r, pattern p)
{ {
if (owner) if (owner)
{ {
StrokeEllipse( r.LeftTop() + BPoint(r.Width()/2, r.Height()/2), check_lock();
r.Width()/2, r.Height()/2, p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_STROKE_ELLIPSE );
owner->fLink->Attach<BRect>( r );
} }
} }
@@ -2353,17 +2351,10 @@ void BView::StrokeEllipse(BRect r, pattern p)
void BView::FillEllipse(BPoint center, float xRadius, float yRadius, void BView::FillEllipse(BPoint center, float xRadius, float yRadius,
pattern p) pattern p)
{ {
if (owner) if(owner)
{ {
check_lock(); FillEllipse( BRect(center.x-xRadius, center.y-yRadius, center.x+xRadius,
center.y+yRadius), p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_FILL_ELLIPSE );
owner->fLink->Attach<BPoint>( center );
owner->fLink->Attach<float>( xRadius );
owner->fLink->Attach<float>( yRadius );
} }
} }
@@ -2373,8 +2364,13 @@ void BView::FillEllipse(BRect r, pattern p)
{ {
if (owner) if (owner)
{ {
FillEllipse(r.LeftTop() + BPoint(r.Width()/2, r.Height()/2), check_lock();
r.Width()/2, r.Height()/2, p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_FILL_ELLIPSE );
owner->fLink->Attach<BRect>( r );
} }
} }
@@ -2383,20 +2379,8 @@ void BView::FillEllipse(BRect r, pattern p)
void BView::StrokeArc(BPoint center, float xRadius, float yRadius, void BView::StrokeArc(BPoint center, float xRadius, float yRadius,
float start_angle, float arc_angle, pattern p) float start_angle, float arc_angle, pattern p)
{ {
if (owner) StrokeArc( BRect(center.x-xRadius, center.y-yRadius, center.x+xRadius,
{ center.y+yRadius), start_angle, arc_angle, p );
check_lock();
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_STROKE_ARC );
owner->fLink->Attach<BPoint>( center );
owner->fLink->Attach<float>( xRadius );
owner->fLink->Attach<float>( yRadius );
owner->fLink->Attach<float>( start_angle );
owner->fLink->Attach<float>( arc_angle );
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -2406,9 +2390,17 @@ void BView::StrokeArc(BRect r, float start_angle, float arc_angle,
{ {
if (owner) if (owner)
{ {
StrokeArc( r.LeftTop() + BPoint(r.Width()/2, r.Height()/2), check_lock();
r.Width()/2, r.Height()/2, start_angle, arc_angle, p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_STROKE_ARC );
owner->fLink->Attach<BRect>(r);
owner->fLink->Attach<float>( start_angle );
owner->fLink->Attach<float>( arc_angle );
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -2416,20 +2408,8 @@ void BView::StrokeArc(BRect r, float start_angle, float arc_angle,
void BView::FillArc(BPoint center,float xRadius, float yRadius, void BView::FillArc(BPoint center,float xRadius, float yRadius,
float start_angle, float arc_angle, pattern p) float start_angle, float arc_angle, pattern p)
{ {
if (owner) FillArc( BRect(center.x-xRadius, center.y-yRadius, center.x+xRadius,
{ center.y+yRadius), start_angle, arc_angle, p );
check_lock();
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_FILL_ARC );
owner->fLink->Attach<BPoint>( center );
owner->fLink->Attach<float>( xRadius );
owner->fLink->Attach<float>( yRadius );
owner->fLink->Attach<float>( start_angle );
owner->fLink->Attach<float>( arc_angle );
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -2439,9 +2419,17 @@ void BView::FillArc(BRect r, float start_angle, float arc_angle,
{ {
if (owner) if (owner)
{ {
FillArc(r.LeftTop() + BPoint(r.Width()/2, r.Height()/2), check_lock();
r.Width()/2, r.Height()/2,start_angle, arc_angle, p );
if ( _is_new_pattern( fState->patt, p ) )
SetPattern( p );
owner->fLink->StartMessage( AS_FILL_ARC );
owner->fLink->Attach<BRect>(r);
owner->fLink->Attach<float>( start_angle );
owner->fLink->Attach<float>( arc_angle );
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------