From d13740ce33be2d91a8fa7de9f4893ee048e15923 Mon Sep 17 00:00:00 2001 From: sukibaby <163092272+sukibaby@users.noreply.github.com> Date: Wed, 4 Sep 2024 01:07:29 -0700 Subject: [PATCH] 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. --- src/Actor.cpp | 11 ++++++----- src/Actor.h | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Actor.cpp b/src/Actor.cpp index 9b765d907b..31b949e94b 100644 --- a/src/Actor.cpp +++ b/src/Actor.cpp @@ -1078,13 +1078,14 @@ void Actor::ScaleTo( const RectF &rect, StretchType st ) float fNewZoomY = std::abs(rect_height / m_size.y); float fNewZoom = 0.f; - switch( st ) + + switch (st) { - case cover: - fNewZoom = fNewZoomX>fNewZoomY ? fNewZoomX : fNewZoomY; // use larger zoom + case kCover: + fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomX : fNewZoomY; // use larger zoom break; - case fit_inside: - fNewZoom = fNewZoomX>fNewZoomY ? fNewZoomY : fNewZoomX; // use smaller zoom + case kFitInside: + fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomY : fNewZoomX; // use smaller zoom break; } diff --git a/src/Actor.h b/src/Actor.h index 3ddd3d91e4..df594c2588 100644 --- a/src/Actor.h +++ b/src/Actor.h @@ -501,12 +501,12 @@ public: /** @brief How do we handle stretching the Actor? */ enum StretchType { - fit_inside, /**< Have the Actor fit inside its parent, using the smaller zoom. */ - cover /**< Have the Actor cover its parent, using the larger zoom. */ + kFitInside, /**< Have the Actor fit inside its parent, using the smaller zoom. */ + kCover /**< Have the Actor cover its parent, using the larger zoom. */ }; - void ScaleToCover( const RectF &rect ) { ScaleTo( rect, cover ); } - void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, fit_inside); }; + void ScaleToCover( const RectF &rect ) { ScaleTo( rect, kCover ); } + void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, kFitInside); }; void ScaleTo( const RectF &rect, StretchType st ); void StretchTo( const RectF &rect );