Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-07 10:53:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of an ifdef

Browse Source
This commit is contained in:
Henrik Rydgård 2023-02-02 14:54:50 +01:00
parent 6cdcce5063
commit a9eaa4fdc8
9 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Common/System/System.h
View File

@ -73,6 +73,7 @@ enum SystemProperty {
SYSPROP_HAS_IMAGE_BROWSER,
SYSPROP_HAS_BACK_BUTTON,
SYSPROP_HAS_KEYBOARD,
SYSPROP_HAS_OPEN_DIRECTORY,
// Available as Int:
SYSPROP_SYSTEMVERSION,

1
Qt/QtMain.cpp
View File

@ -235,6 +235,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
return true;
case SYSPROP_HAS_FILE_BROWSER:
case SYSPROP_HAS_FOLDER_BROWSER:
case SYSPROP_HAS_OPEN_DIRECTORY:
return true;
case SYSPROP_SUPPORTS_OPEN_FILE_IN_EDITOR:
return true; // FileUtil.cpp: OpenFileInEditor

6
SDL/SDLMain.cpp
View File

@ -427,6 +427,12 @@ float System_GetPropertyFloat(SystemProperty prop) {
bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_OPEN_DIRECTORY:
#if PPSSPP_PLATFORM(WINDOWS)
return true;
#elif PPSSPP_PLATFORM(MAC) || (PPSSPP_PLATFORM(LINUX) && !PPSSPP_PLATFORM(ANDROID))
return true;
#endif
case SYSPROP_HAS_BACK_BUTTON:
return true;
case SYSPROP_APP_GOLD:

14
UI/GameSettingsScreen.cpp
View File

@ -963,9 +963,12 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
systemSettings->Add(new ItemHeader(sy->T("PSP Memory Stick")));
#if (defined(USING_QT_UI) || PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC)) && !PPSSPP_PLATFORM(UWP)
systemSettings->Add(new Choice(sy->T("Show Memory Stick folder")))->OnClick.Handle(this, &GameSettingsScreen::OnOpenMemStick);
#endif
if (System_GetPropertyBool(SYSPROP_HAS_OPEN_DIRECTORY)) {
systemSettings->Add(new Choice(sy->T("Show Memory Stick folder")))->OnClick.Add([](UI::EventParams &p) {
OpenDirectory(File::ResolvePath(g_Config.memStickDirectory.ToString()).c_str());
return UI::EVENT_DONE;
});
}
#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
systemSettings->Add(new Choice(sy->T("Set Memory Stick folder")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMemStickDir);
@ -1243,11 +1246,6 @@ UI::EventReturn GameSettingsScreen::OnChangeMemStickDir(UI::EventParams &e) {
return UI::EVENT_DONE;
}
UI::EventReturn GameSettingsScreen::OnOpenMemStick(UI::EventParams &e) {
OpenDirectory(File::ResolvePath(g_Config.memStickDirectory.ToString()).c_str());
return UI::EVENT_DONE;
}
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
UI::EventReturn GameSettingsScreen::OnSavePathMydoc(UI::EventParams &e) {

1
UI/GameSettingsScreen.h
View File

@ -118,7 +118,6 @@ private:
UI::EventReturn OnAudioDevice(UI::EventParams &e);
UI::EventReturn OnJitAffectingSetting(UI::EventParams &e);
UI::EventReturn OnChangeMemStickDir(UI::EventParams &e);
UI::EventReturn OnOpenMemStick(UI::EventParams &e);
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
UI::EventReturn OnSavePathMydoc(UI::EventParams &e);
UI::EventReturn OnSavePathOther(UI::EventParams &e);

2
UWP/PPSSPP_UWPMain.cpp
View File

@ -411,6 +411,8 @@ void System_Toast(const char *str) {}
bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_OPEN_DIRECTORY:
return false;
case SYSPROP_HAS_FILE_BROWSER:
return true;
case SYSPROP_HAS_FOLDER_BROWSER:

1
Windows/main.cpp
View File

@ -346,6 +346,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_FILE_BROWSER:
case SYSPROP_HAS_FOLDER_BROWSER:
case SYSPROP_HAS_OPEN_DIRECTORY:
return true;
case SYSPROP_HAS_IMAGE_BROWSER:
return true;

2
android/jni/app-android.cpp
View File

@ -491,6 +491,8 @@ bool System_GetPropertyBool(SystemProperty prop) {
}
case SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE:
return sustainedPerfSupported; // 7.0 introduced sustained performance mode as an optional feature.
case SYSPROP_HAS_OPEN_DIRECTORY:
return false;
case SYSPROP_HAS_ADDITIONAL_STORAGE:
return !g_additionalStorageDirs.empty();
case SYSPROP_HAS_BACK_BUTTON:

2
ios/main.mm
View File

@ -152,6 +152,8 @@ float System_GetPropertyFloat(SystemProperty prop) {
bool System_GetPropertyBool(SystemProperty prop) {
switch (prop) {
case SYSPROP_HAS_OPEN_DIRECTORY:
return false;
case SYSPROP_HAS_BACK_BUTTON:
return false;
case SYSPROP_APP_GOLD: