Rename the StretchType enum in Actor
The lowercase enum is confusing because it looks like a variable. This prefixes it with a class name so it's easier to understand its purpose.
This commit is contained in:
+6
-5
@@ -1078,13 +1078,14 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
|
|||||||
float fNewZoomY = std::abs(rect_height / m_size.y);
|
float fNewZoomY = std::abs(rect_height / m_size.y);
|
||||||
|
|
||||||
float fNewZoom = 0.f;
|
float fNewZoom = 0.f;
|
||||||
switch( st )
|
|
||||||
|
switch (st)
|
||||||
{
|
{
|
||||||
case cover:
|
case kCover:
|
||||||
fNewZoom = fNewZoomX>fNewZoomY ? fNewZoomX : fNewZoomY; // use larger zoom
|
fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomX : fNewZoomY; // use larger zoom
|
||||||
break;
|
break;
|
||||||
case fit_inside:
|
case kFitInside:
|
||||||
fNewZoom = fNewZoomX>fNewZoomY ? fNewZoomY : fNewZoomX; // use smaller zoom
|
fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomY : fNewZoomX; // use smaller zoom
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -501,12 +501,12 @@ public:
|
|||||||
/** @brief How do we handle stretching the Actor? */
|
/** @brief How do we handle stretching the Actor? */
|
||||||
enum StretchType
|
enum StretchType
|
||||||
{
|
{
|
||||||
fit_inside, /**< Have the Actor fit inside its parent, using the smaller zoom. */
|
kFitInside, /**< Have the Actor fit inside its parent, using the smaller zoom. */
|
||||||
cover /**< Have the Actor cover its parent, using the larger zoom. */
|
kCover /**< Have the Actor cover its parent, using the larger zoom. */
|
||||||
};
|
};
|
||||||
|
|
||||||
void ScaleToCover( const RectF &rect ) { ScaleTo( rect, cover ); }
|
void ScaleToCover( const RectF &rect ) { ScaleTo( rect, kCover ); }
|
||||||
void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, fit_inside); };
|
void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, kFitInside); };
|
||||||
void ScaleTo( const RectF &rect, StretchType st );
|
void ScaleTo( const RectF &rect, StretchType st );
|
||||||
|
|
||||||
void StretchTo( const RectF &rect );
|
void StretchTo( const RectF &rect );
|
||||||
|
|||||||
Reference in New Issue
Block a user