Added battery function on win32 also (defaulting to val 50) useful fo…

…r theme testing
proconsule · Feb 27, 2022 · 5595a86 · 5595a86
1 parent 0a3427c
commit 5595a86
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/include/utils.h b/include/utils.h
@@ -60,9 +60,7 @@ namespace Utility{
 	int getLanguagesIdx(std::string lang);
 
 	void replace(std::string& subject, const std::string& search,const std::string& replace);
-	#ifdef __SWITCH__
-	u32 GetBatteryPercentage(void);
-	#endif
+	uint32_t GetBatteryPercentage(void);
 	std::string scrapElement(std::string content, std::string get,std::string delim);
 	std::string KeyboardCall (std::string hint="", std::string text="");
 	std::string Nozomi_Link(std::string Link);

diff --git a/source/gui.cpp b/source/gui.cpp
@@ -996,9 +996,9 @@ namespace GUI {
 				changeFontTheme();
 				dochangethemefont = false;
 			}
-			#ifdef __SWITCH__
+
             batteryPorcent = Utility::GetBatteryPercentage();
-			#endif
+
 
 			#ifdef NXMP_SWITCH
     		//rewrite switch state

diff --git a/source/utils.cpp b/source/utils.cpp
@@ -506,17 +506,20 @@ SwkbdTextCheckResult Keyboard_ValidateText(char *string, size_t size) {
 	return SwkbdTextCheckResult_OK;
 }
 #endif
+uint32_t GetBatteryPercentage(void) {
+#ifdef _WIN32
+	return 50;
+#endif
 #ifdef __SWITCH__
- u32 GetBatteryPercentage(void) {
         Result ret = 0;
         u32 percentage = 0;
-        
+
         if (R_FAILED(ret = psmGetBatteryChargePercentage(&percentage)))
             return 0;
 
         return percentage;
-    }
 #endif
+    }
 std::string KeyboardCall (std::string hint, std::string text){
 	#ifdef __SWITCH__
 	Result ret = 0;