computerscare-vcv-modules

commit 20162386d6820c8c980e1ca13c82d5481f48ccd5
parent 538280dada3ca43fc5368bf7e64a55b877d4408d
Author: Adam M <[email protected]>
Date:   Wed, 27 Jan 2021 08:55:35 -0600

reset zoom on switch image, check for uppercase image extensions

Diffstat:
M
src/ComputerscareBlank.cpp
 | 
11
++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/ComputerscareBlank.cpp b/src/ComputerscareBlank.cpp
@@ -327,10 +327,15 @@ struct ComputerscareBlank : ComputerscareMenuParamModule {
 			std::string name = dirp->d_name;
 
 			std::size_t found = name.find(".gif", name.length() - 5);
+			if (found == std::string::npos) found = name.find(".GIF", name.length() - 5);
 			if (found == std::string::npos) found = name.find(".png", name.length() - 5);
+			if (found == std::string::npos) found = name.find(".PNG", name.length() - 5);
 			if (found == std::string::npos) found = name.find(".jpg", name.length() - 5);
+			if (found == std::string::npos) found = name.find(".JPG", name.length() - 5);
 			if (found == std::string::npos) found = name.find(".jpeg", name.length() - 5);
+			if (found == std::string::npos) found = name.find(".JPEG", name.length() - 5);
 			if (found == std::string::npos) found = name.find(".bmp", name.length() - 5);
+			if (found == std::string::npos) found = name.find(".BMP", name.length() - 5);
 			if (found != std::string::npos) {
 				currentImageFullpath = parentDirectory + "/" + name;
 				catalog.push_back(currentImageFullpath);
@@ -833,14 +838,14 @@ struct PNGDisplay : TransparentWidget {
 				nvgImageSize(args.vg, img, &imgWidth, &imgHeight);
 				imgRatio = ((float)imgWidth / (float)imgHeight);
 
-				//empty->anything then dont reset
+				//path==empty means that it is 1st load of the module from JSON
 				//not empty -> anything then reset
 
 				if (modulePath != "empty") {
 					DEBUG("path:%s", modulePath.c_str());
 				}
-				if (path == "empty") {
-					//resetZooms();
+				if (path != "empty") {
+					resetZooms();
 				}
 				path = modulePath;