Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-08 14:58:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12009 from unknownbrackets/ui-minor

Browse Source 
UI: Make the screenshot key configurable
This commit is contained in:
Henrik Rydgård 2019-05-01 15:17:48 +02:00 committed by GitHub
commit 54bb78fd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Common/KeyMap.cpp
View File

@ -670,6 +670,7 @@ const KeyMap_IntStrPair psp_button_names[] = {
{VIRTKEY_DEVMENU, "DevMenu"}, {VIRTKEY_DEVMENU, "DevMenu"},
{VIRTKEY_TEXTURE_DUMP, "Texture Dumping"}, {VIRTKEY_TEXTURE_DUMP, "Texture Dumping"},
{VIRTKEY_TEXTURE_REPLACE, "Texture Replacement"}, {VIRTKEY_TEXTURE_REPLACE, "Texture Replacement"},
{VIRTKEY_SCREENSHOT, "Screenshot"},
{CTRL_HOME, "Home"}, {CTRL_HOME, "Home"},
{CTRL_HOLD, "Hold"}, {CTRL_HOLD, "Hold"},

1
Common/KeyMap.h
View File

@ -56,6 +56,7 @@ enum {
VIRTKEY_SPEED_CUSTOM2 = 0x40000018, VIRTKEY_SPEED_CUSTOM2 = 0x40000018,
VIRTKEY_TEXTURE_DUMP = 0x40000019, VIRTKEY_TEXTURE_DUMP = 0x40000019,
VIRTKEY_TEXTURE_REPLACE = 0x4000001A, VIRTKEY_TEXTURE_REPLACE = 0x4000001A,
VIRTKEY_SCREENSHOT = 0x4000001B,
VIRTKEY_LAST, VIRTKEY_LAST,
VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
}; };

6
UI/EmuScreen.cpp
View File

@ -91,6 +91,8 @@ static bool frameStep_;
static int lastNumFlips; static int lastNumFlips;
static bool startDumping; static bool startDumping;
extern bool g_TakeScreenshot;
static void __EmuScreenVblank() static void __EmuScreenVblank()
{ {
I18NCategory *sy = GetI18NCategory("System"); I18NCategory *sy = GetI18NCategory("System");
@ -607,6 +609,10 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) {
System_SendMessage("toggle_fullscreen", ""); System_SendMessage("toggle_fullscreen", "");
break; break;
case VIRTKEY_SCREENSHOT:
g_TakeScreenshot = true;
break;
case VIRTKEY_TEXTURE_DUMP: case VIRTKEY_TEXTURE_DUMP:
g_Config.bSaveNewTextures = !g_Config.bSaveNewTextures; g_Config.bSaveNewTextures = !g_Config.bSaveNewTextures;
if (g_Config.bSaveNewTextures) { if (g_Config.bSaveNewTextures) {

2
UI/NativeApp.cpp
View File

@ -887,7 +887,6 @@ void NativeShutdownGraphics() {
void TakeScreenshot() { void TakeScreenshot() {
g_TakeScreenshot = false; g_TakeScreenshot = false;
#if defined(_WIN32) || (defined(USING_QT_UI) && !defined(MOBILE_DEVICE))
std::string path = GetSysDirectory(DIRECTORY_SCREENSHOT); std::string path = GetSysDirectory(DIRECTORY_SCREENSHOT);
while (path.length() > 0 && path.back() == '/') { while (path.length() > 0 && path.back() == '/') {
path.resize(path.size() - 1); path.resize(path.size() - 1);
@ -920,7 +919,6 @@ void TakeScreenshot() {
I18NCategory *err = GetI18NCategory("Error"); I18NCategory *err = GetI18NCategory("Error");
osm.Show(err->T("Could not save screenshot file")); osm.Show(err->T("Could not save screenshot file"));
} }
#endif
} }
void RenderOverlays(UIContext *dc, void *userdata) { void RenderOverlays(UIContext *dc, void *userdata) {