actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make ScaleToCover, ScaleToFitInside act reasonably with different horizalign,

Browse Source 
vertalign
This commit is contained in:
Glenn Maynard
2005-12-08 01:21:50 +00:00
parent 68413b77cf
commit a4729f0b80
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+14 -5
View File
@@ -800,10 +800,6 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
if( rect_width < 0 ) SetRotationY( 180 ); if( rect_width < 0 ) SetRotationY( 180 );
if( rect_height < 0 ) SetRotationX( 180 ); if( rect_height < 0 ) SetRotationX( 180 );
// center of the rectangle
float rect_cx = rect.left + rect_width/2;
float rect_cy = rect.top + rect_height/2;
// zoom fActor needed to scale the Actor to fill the rectangle // zoom fActor needed to scale the Actor to fill the rectangle
float fNewZoomX = fabsf(rect_width / m_size.x); float fNewZoomX = fabsf(rect_width / m_size.x);
float fNewZoomY = fabsf(rect_height / m_size.y); float fNewZoomY = fabsf(rect_height / m_size.y);
@@ -819,7 +815,20 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
break; break;
} }
SetXY( rect_cx, rect_cy ); switch( m_HorizAlign )
{
case align_left: SetX( rect.left ); break;
case align_center: SetX( rect.left + rect_width/2 ); break;
case align_right: SetX( rect.left + rect_width ); break;
}
switch( m_VertAlign )
{
case align_top: SetY( rect.top ); break;
case align_middle: SetY( rect.top + rect_height/2 ); break;
case align_bottom: SetY( rect.top + rect_height ); break;
}
SetZoom( fNewZoom ); SetZoom( fNewZoom );
} }