From bcd7e8e1d28a878bdd2b8cbbf2e4516721007dc2 Mon Sep 17 00:00:00 2001 From: sukibaby <163092272+sukibaby@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:40:04 -0700 Subject: [PATCH] put the enum class back --- src/Actor.cpp | 4 ++-- src/Actor.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Actor.cpp b/src/Actor.cpp index 31b949e94b..6dab81b3b2 100644 --- a/src/Actor.cpp +++ b/src/Actor.cpp @@ -1081,10 +1081,10 @@ void Actor::ScaleTo( const RectF &rect, StretchType st ) switch (st) { - case kCover: + case StretchType::kCover: fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomX : fNewZoomY; // use larger zoom break; - case kFitInside: + case StretchType::kFitInside: fNewZoom = fNewZoomX > fNewZoomY ? fNewZoomY : fNewZoomX; // use smaller zoom break; } diff --git a/src/Actor.h b/src/Actor.h index df594c2588..c74dd0d864 100644 --- a/src/Actor.h +++ b/src/Actor.h @@ -499,14 +499,14 @@ public: const TweenState& DestTweenState() const { return const_cast(this)->DestTweenState(); } /** @brief How do we handle stretching the Actor? */ - enum StretchType + enum class StretchType { 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, kCover ); } - void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, kFitInside); }; + void ScaleToCover( const RectF &rect ) { ScaleTo( rect, StretchType::kCover ); } + void ScaleToFitInside( const RectF &rect ) { ScaleTo( rect, StretchType::kFitInside); }; void ScaleTo( const RectF &rect, StretchType st ); void StretchTo( const RectF &rect );