fix scroll on applist, some windows includes

gui/AppDetailsContent.cpp

@@ -277,16 +277,11 @@ bool AppDetailsContent::process(InputEvents* event)
 
 	int maxScrollOffset = screenshotsContainer.y + screenshotsContainer.height - SCREEN_HEIGHT + 100;
 
-	// make sure the max scroll offset is at least the screen height
-	if (maxScrollOffset < SCREEN_HEIGHT) {
+	// make sure the max scroll offset is positive and snap <50 to 0
+	if (maxScrollOffset < 50) {
 		maxScrollOffset = 0;
 	}
 
-	// if our screen scroll is too far down, stop the scroll
-	// printf("Screenshot container y: %d\n", screenshotsContainer.y);
-	// printf("Screenshot height: %d\n", screenshotsContainer.height);
-	// printf("Scroll offset: %d\n", this->y + this->yOff);
-
 	// if we're not touch dragging, and we're out of bounds, reset scroll bounds
 	if ((!event->isScrolling || event->isTouchUp()) && abs(this->y + this->yOff) > maxScrollOffset) {
 		this->y = -maxScrollOffset;

gui/AppList.cpp

@@ -19,7 +19,9 @@
 #endif
 
 const char* AppList::sortingDescriptions[TOTAL_SORTS] = { "by most recent", "by download count", "alphabetically", "by size (descending)", "randomly" };
+
 CST_Color AppList::red = { 0xff, 0, 0, 0xff };
+CST_Color AppList::lighterRed = { 0xef, 0x48, 0x48, 0xff };
 
 AppList::AppList(Get* get, Sidebar* sidebar)
 	: get(get)			// the main get instance that contains repo info and stuff
@@ -80,6 +82,8 @@ AppList::AppList(Get* get, Sidebar* sidebar)
 	sortBlurb.setSize(15);
 	sortBlurb.setColor(HBAS::ThemeManager::textSecondary);
 
+	auto myRed = HBAS::ThemeManager::isDarkMode ? lighterRed : red;
+
 #if defined(__WIIU__)
   useBannerIcons = true;
 #elif defined(SWITCH)
@@ -91,14 +95,14 @@ AppList::AppList(Get* get, Sidebar* sidebar)
   if (!useBannerIcons) {
 	// applet mode, display a warning
 	nowPlayingText.setText("NOTICE: You are in Applet mode! Google \"Switch Applet Mode\" for more info.");
-	nowPlayingText.setColor(red);
+	nowPlayingText.setColor(myRed);
 	nowPlayingText.update();
   }
 #endif
 
 #ifdef DEBUG_BUILD
 	nowPlayingText.setText("NOTICE: You are using a dev build! Update to a stable release if this is unintended.");
-	nowPlayingText.setColor(red);
+	nowPlayingText.setColor(myRed);
 	nowPlayingText.update();
 #endif
 

gui/AppList.hpp

@@ -69,7 +69,7 @@ class AppList : public ListElement
 	void keyboardInputCallback();
 
 	// the title of this category (from the sidebar)
-	static CST_Color black, gray, red;
+	static CST_Color black, gray, red, lighterRed;
 	static const char* sortingDescriptions[TOTAL_SORTS];
 
 	TextElement sortBlurb;

gui/ThemeManager.cpp

@@ -4,6 +4,10 @@
 #include <switch.h>
 #endif
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 namespace HBAS::ThemeManager
 {
     void themeManagerInit()