Release Notes: Handle C-Pad scrolling with floats

Previously it was very obvious when you moved from the the area that counted as 1px to 2px, this just feels a bit better if you try to scroll slowly

Author: Epicpkmn11

include/screens/mainScreen.hpp

@@ -57,7 +57,8 @@ class MainScreen : public Screen {
 		 ascending = false, updateFilter = false, screenshotFetch = false, canDisplay = false, isAND = true;
 
 	int storeMode = 0, marks = 0, markIndex = 0, sPage = 0, lMode = 0, sSelection = 0,
-		lastMode = 0, smallDelay = 0, sPos = 0, screenshotIndex = 0, sSize = 0, zoom = 0, scrollOffset = 0, scrollDelta = 0, queueIndex = 0;
+		lastMode = 0, smallDelay = 0, sPos = 0, screenshotIndex = 0, sSize = 0, zoom = 0, queueIndex = 0;
+	float scrollOffset = 0.0f, scrollDelta = 0.0f;
 
 	SortType sorttype = SortType::LAST_UPDATED;
 

include/store/storeUtils.hpp

@@ -95,8 +95,8 @@ namespace StoreUtils {
 	size_t FindSplitPoint(const std::string &str, const std::vector<std::string> splitters);
 	void ProcessReleaseNotes(std::string ReleaseNotes);
 
-	void DrawReleaseNotes(const int &scrollOffset, const std::unique_ptr<StoreEntry> &entry);
-	void ReleaseNotesLogic(int &scrollOffset, int &scrollDelta, int &storeMode);
+	void DrawReleaseNotes(const float &scrollOffset, const std::unique_ptr<StoreEntry> &entry);
+	void ReleaseNotesLogic(float &scrollOffset, float &scrollDelta, int &storeMode);
 
 	bool compareTitleDescending(const std::unique_ptr<StoreEntry> &a, const std::unique_ptr<StoreEntry> &b);
 	bool compareTitleAscending(const std::unique_ptr<StoreEntry> &a, const std::unique_ptr<StoreEntry> &b);

source/menu/releaseNotes.cpp

@@ -78,7 +78,7 @@ void StoreUtils::ProcessReleaseNotes(std::string releaseNotes) {
 	} while (splitPos != std::string::npos);
 }
 
-void StoreUtils::DrawReleaseNotes(const int &scrollOffset, const std::unique_ptr<StoreEntry> &entry) {
+void StoreUtils::DrawReleaseNotes(const float &scrollOffset, const std::unique_ptr<StoreEntry> &entry) {
 	if (entry && StoreUtils::store) {
 		Gui::ScreenDraw(Bottom);
 		Gui::Draw_Rect(0, 26, 320, 214, UIThemes->BGColor());
@@ -106,33 +106,38 @@ void StoreUtils::DrawReleaseNotes(const int &scrollOffset, const std::unique_ptr
 /*
 	As the name says: Release notes logic.
 
-	int &scrollOffset: The scroll offset for the Release Notes text.
-	int &scrollDelta: The scroll delta for the Release Notes text.
+	float &scrollOffset: The scroll offset for the Release Notes text.
+	float &scrollDelta: The scroll delta for the Release Notes text.
 	int &storeMode: The store mode to properly return back.
 */
-void StoreUtils::ReleaseNotesLogic(int &scrollOffset, int &scrollDelta, int &storeMode) {
+void StoreUtils::ReleaseNotesLogic(float &scrollOffset, float &scrollDelta, int &storeMode) {
 	int linesPerScreen = ((240.0f - 25.0f) / Gui::GetStringHeight(0.5f, "", font));
 	scrollOffset += scrollDelta;
-	if (scrollDelta != 0) {
-		scrollDelta > 0 ? scrollDelta-- : scrollDelta++;
+	if (scrollDelta > 0) {
+		scrollDelta = std::max(scrollDelta - 1.0f, 0.0f);
+	} else if (scrollDelta < 0) {
+		scrollDelta = std::min(scrollDelta + 1.0f, 0.0f);
 	}
 
 	if ((int)wrappedNotes.size() > linesPerScreen) {
 		//D-Pad
-		if (hHeld & KEY_DDOWN && scrollDelta < 10) scrollDelta += 2;
-		if (hHeld & KEY_DUP && scrollDelta > -10) scrollDelta -= 2;
-		if (hHeld & KEY_DRIGHT && scrollDelta < 20) scrollDelta += 5;
-		if (hHeld & KEY_DLEFT && scrollDelta > -20) scrollDelta -= 5;
+		if (hHeld & KEY_DDOWN && scrollDelta < 10.0f) scrollDelta += 2.0f;
+		if (hHeld & KEY_DUP && scrollDelta > -10.0f) scrollDelta -= 2.0f;
+		if (hHeld & KEY_DRIGHT && scrollDelta < 20.0f) scrollDelta += 5.0f;
+		if (hHeld & KEY_DLEFT && scrollDelta > -20.0f) scrollDelta -= 5.0f;
 
 		//Circle Pad
 		circlePosition circlePad;
 		hidCircleRead(std::addressof(circlePad));
-		if (scrollDelta < 10 && scrollDelta > -10) scrollDelta -= circlePad.dy / 60;
+		float deltaCircle = -circlePad.dy / 60.0f;
+		if (deltaCircle >= 0.5f || deltaCircle <= -0.5f) {
+			if (scrollDelta < 10.0f && scrollDelta > -10.0f) scrollDelta += deltaCircle;
+		}
 
 		//Touch
 		if (hDown & KEY_TOUCH && touch.py > 25) {
 			touches[1] = touch;
-			scrollDelta = 0;
+			scrollDelta = 0.0f;
 		}
 		if (hHeld & KEY_TOUCH) {
 			if (touch.py > 25) {
@@ -148,20 +153,20 @@ void StoreUtils::ReleaseNotesLogic(int &scrollOffset, int &scrollDelta, int &sto
 	}
 
 	/* Ensure it doesn't scroll off screen. */
-	if (scrollOffset < 0) {
-		scrollOffset = 0;
-		scrollDelta = 0;
+	if (scrollOffset < 0.0f) {
+		scrollOffset = 0.0f;
+		scrollDelta = 0.0f;
 	}
 	int maxScroll = wrappedNotes.size() * Gui::GetStringHeight(0.5f, "", font) - (240.0f - 25.0f);
 	if (scrollOffset > maxScroll && ((int)wrappedNotes.size() > linesPerScreen)) {
 		scrollOffset = maxScroll;
-		scrollDelta = 0;
+		scrollDelta = 0.0f;
 	}
 
 	if (hDown & KEY_B || (hDown & KEY_TOUCH && touching(touch, back))) {
 		if (config->changelog()) config->changelog(false);
-		scrollOffset = 0;
-		scrollDelta = 0;
+		scrollOffset = 0.0f;
+		scrollDelta = 0.0f;
 		storeMode = 0;
 	}
 }