From f195fcf8a7445fede0333ab320f6b7543c9ca5c1 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Fri, 13 Nov 2020 00:02:09 +0100 Subject: [PATCH] Small adjustments to the screensaver game info overlay. --- USERGUIDE.md | 4 ++-- es-app/src/SystemScreensaver.cpp | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/USERGUIDE.md b/USERGUIDE.md index fab64bbe7..451d5ff41 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -695,7 +695,7 @@ This will fill the entire screen surface but will possibly break the aspect rati **Display game info overlay** -This will display an overlay in the bottom left corner, showing the game name and the game system name. +This will display an overlay in the bottom left corner, showing the game name and the game system name. A star following the game name indicates that it's a favorite. **Render scanlines** _(OpenGL renderer only)_ @@ -731,7 +731,7 @@ This will fill the entire screen surface but will possibly break the aspect rati **Display game info overlay** -This will display an overlay in the bottom left corner, showing the game name and the game system name. +This will display an overlay in the bottom left corner, showing the game name and the game system name. A star following the game name indicates that it's a favorite. **Render scanlines** _(OpenGL renderer only)_ diff --git a/es-app/src/SystemScreensaver.cpp b/es-app/src/SystemScreensaver.cpp index 6489cf6c5..d74df7843 100644 --- a/es-app/src/SystemScreensaver.cpp +++ b/es-app/src/SystemScreensaver.cpp @@ -302,13 +302,14 @@ void SystemScreensaver::renderScreensaver() mGameOverlayRectangleCoords[3], 0x00000000 | mRectangleFadeIn, 0x00000000 | mRectangleFadeIn ); } - if (mRectangleFadeIn < 180) - mRectangleFadeIn = Math::clamp(mRectangleFadeIn + 6, 0, 255); + mRectangleFadeIn = Math::clamp(mRectangleFadeIn + 6 + + mRectangleFadeIn / 20, 0, 170); mGameOverlay.get()->setColor(0xFFFFFF00 | mTextFadeIn); - mGameOverlayFont.at(0)->renderTextCache(mGameOverlay.get()); + if (mTextFadeIn > 50) + mGameOverlayFont.at(0)->renderTextCache(mGameOverlay.get()); if (mTextFadeIn < 255) - mTextFadeIn = Math::clamp(mTextFadeIn + 8, 0, 255); + mTextFadeIn = Math::clamp(mTextFadeIn + 2 + mTextFadeIn / 6, 0, 255); } } else { @@ -343,13 +344,14 @@ void SystemScreensaver::renderScreensaver() mGameOverlayRectangleCoords[3], 0x00000000 | mRectangleFadeIn, 0x00000000 | mRectangleFadeIn ); } - if (mRectangleFadeIn < 180) - mRectangleFadeIn = Math::clamp(mRectangleFadeIn + 6, 0, 255); + mRectangleFadeIn = Math::clamp(mRectangleFadeIn + 6 + + mRectangleFadeIn / 20, 0, 170); mGameOverlay.get()->setColor(0xFFFFFF00 | mTextFadeIn); - mGameOverlayFont.at(0)->renderTextCache(mGameOverlay.get()); + if (mTextFadeIn > 50) + mGameOverlayFont.at(0)->renderTextCache(mGameOverlay.get()); if (mTextFadeIn < 255) - mTextFadeIn = Math::clamp(mTextFadeIn + 8, 0, 255); + mTextFadeIn = Math::clamp(mTextFadeIn + 2 + mTextFadeIn / 6, 0, 255); } } else {