DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Do NOT allow fade effects for now.

Browse Source
This commit is contained in:
StackZ
2020-05-27 14:38:14 +02:00
parent a320b5770e
commit 8a16751a8f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/screens/settings.cpp
+4 -4
View File
@@ -266,7 +266,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY")); Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
changesMade = true; changesMade = true;
} else if (Selection == 3) { } else if (Selection == 3) {
if (Config::fading) { /*if (Config::fading) {
if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) { if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
Config::fading = false; Config::fading = false;
Msg::DisplayWarnMsg(Lang::get("DISABLED")); Msg::DisplayWarnMsg(Lang::get("DISABLED"));
@@ -278,7 +278,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
Msg::DisplayWarnMsg(Lang::get("ENABLED")); Msg::DisplayWarnMsg(Lang::get("ENABLED"));
changesMade = true; changesMade = true;
} }
} }*/
} }
} }
@@ -296,7 +296,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
} else if (touching(touch, mainButtons2[2])) { } else if (touching(touch, mainButtons2[2])) {
Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY")); Config::keyDelay = Input::getUint(255, Lang::get("ENTER_KEY_DELAY"));
changesMade = true; changesMade = true;
} else if (touching(touch, mainButtons2[3])) { } /*else if (touching(touch, mainButtons2[3])) {
if (Config::fading) { if (Config::fading) {
if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) { if (Msg::promptMsg(Lang::get("TOGGLE_FADE_DISABLE"))) {
Config::fading = false; Config::fading = false;
@@ -310,7 +310,7 @@ void Settings::MiscSettingsLogic(u32 hDown, u32 hHeld, touchPosition touch) {
changesMade = true; changesMade = true;
} }
} }
} }*/
} }
if ((hDown & KEY_B || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) { if ((hDown & KEY_B || hDown & KEY_L) || (hDown & KEY_TOUCH && touching(touch, arrowPos[2]))) {
source/utils/config.cpp
+7 -7
View File
@@ -55,7 +55,7 @@ int Config::notFound;
int Config::future; int Config::future;
int Config::Button; int Config::Button;
int Config::keyDelay = 5; int Config::keyDelay = 5;
bool Config::fading = true; bool Config::fading = false;
nlohmann::json configJson; nlohmann::json configJson;
extern bool changesMade; extern bool changesMade;
@@ -208,11 +208,11 @@ void Config::load() {
keyDelay = getInt("KEY_DELAY"); keyDelay = getInt("KEY_DELAY");
} }
if(!configJson.contains("SCREEN_FADE")) { /* if(!configJson.contains("SCREEN_FADE")) {
fading = true; fading = false;
} else { } else {
fading = getBool("SCREEN_FADE"); fading = getBool("SCREEN_FADE");
} }*/
fclose(file); fclose(file);
} else { } else {
@@ -237,9 +237,9 @@ void Config::load() {
uptodate = C2D_Color32(0xa5, 0xdd, 0x81, 255); uptodate = C2D_Color32(0xa5, 0xdd, 0x81, 255);
notFound = C2D_Color32(255, 128, 0, 255); notFound = C2D_Color32(255, 128, 0, 255);
future = C2D_Color32(255, 255, 0, 255); future = C2D_Color32(255, 255, 0, 255);
Button = C2D_Color32(0, 0, 50, 255); Button = C2D_Color32(0, 0, 50, 255);
keyDelay = 5; keyDelay = 5;
fading = true; fading = false;
} }
} }
@@ -301,7 +301,7 @@ void Config::initializeNewConfig() {
setInt("FUTURE", C2D_Color32(255, 255, 0, 255)); setInt("FUTURE", C2D_Color32(255, 255, 0, 255));
setInt("BUTTON", C2D_Color32(0, 0, 50, 255)); setInt("BUTTON", C2D_Color32(0, 0, 50, 255));
setInt("KEY_DELAY", 5); setInt("KEY_DELAY", 5);
setBool("SCREEN_FADE", true); setBool("SCREEN_FADE", false);
if(file) fwrite(configJson.dump(1, '\t').c_str(), 1, configJson.dump(1, '\t').size(), file); if(file) fwrite(configJson.dump(1, '\t').c_str(), 1, configJson.dump(1, '\t').size(), file);
fclose(file); fclose(file);