Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Windows: Disable auto-enable chat on Ctrl-C.

Browse source 
It's annoying when this triggers unexpectedly.  Sometimes it happens when
using debug windows.
This commit is contained in:
Unknown W. Brackets 2021-09-15 00:12:33 -07:00
parent cf045dfbbc
commit 75f5c75045
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
UI/EmuScreen.cpp
View file

@ -488,25 +488,23 @@ void EmuScreen::sendMessage(const char *message, const char *value) {
gstate_c.skipDrawReason &= ~SKIPDRAW_WINDOW_MINIMIZED;
}
} else if (!strcmp(message, "chat screen")) {
if (!chatButton_)
RecreateViews();
if (g_Config.bEnableNetworkChat) {
if (!chatButton_)
RecreateViews();
#if defined(USING_WIN_UI)
//temporary workaround for hotkey its freeze the ui when open chat screen using hotkey and native keyboard is enable
if (g_Config.bBypassOSKWithKeyboard) {
osm.Show("Disable windows native keyboard options to use ctrl + c hotkey", 2.0f);
} else {
if (g_Config.bEnableNetworkChat) {
//temporary workaround for hotkey its freeze the ui when open chat screen using hotkey and native keyboard is enable
if (g_Config.bBypassOSKWithKeyboard) {
osm.Show("Disable windows native keyboard options to use ctrl + c hotkey", 2.0f);
} else {
UI::EventParams e{};
OnChatMenu.Trigger(e);
}
}
#else
if (g_Config.bEnableNetworkChat) {
UI::EventParams e{};
OnChatMenu.Trigger(e);
}
#endif
}
} else if (!strcmp(message, "app_resumed") && screenManager()->topScreen() == this) {
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
if (!KeyMap::IsKeyMapped(DEVICE_ID_PAD_0, VIRTKEY_PAUSE) || !KeyMap::IsKeyMapped(DEVICE_ID_PAD_1, VIRTKEY_PAUSE)) {

8
Windows/MainWindowMenu.cpp
View file

@ -80,6 +80,7 @@ namespace MainWindow {
EnableMenuItem(menu, ID_EMULATION_STOP, menuEnable);
EnableMenuItem(menu, ID_EMULATION_RESET, menuEnable);
EnableMenuItem(menu, ID_EMULATION_SWITCH_UMD, umdSwitchEnable);
EnableMenuItem(menu, ID_EMULATION_CHAT, g_Config.bEnableNetworkChat ? menuInGameEnable : MF_GRAYED);
EnableMenuItem(menu, ID_TOGGLE_BREAK, menuEnable);
EnableMenuItem(menu, ID_DEBUG_LOADMAPFILE, menuEnable);
EnableMenuItem(menu, ID_DEBUG_SAVEMAPFILE, menuEnable);
@ -636,10 +637,6 @@ namespace MainWindow {
osm.ShowOnOff(gr->T("Cheats"), g_Config.bEnableCheats);
break;
case ID_EMULATION_CHAT:
if (!g_Config.bEnableNetworkChat) {
g_Config.bEnableNetworkChat = true;
UpdateCommands();
}
if (GetUIState() == UISTATE_INGAME) {
NativeMessageReceived("chat screen", "");
}
@ -1371,7 +1368,7 @@ namespace MainWindow {
static CoreState lastCoreState = CORE_BOOT_ERROR;
HMENU menu = GetMenu(GetHWND());
EnableMenuItem(menu, ID_DEBUG_LOG, !g_Config.bEnableLogging);
EnableMenuItem(menu, ID_DEBUG_LOG, g_Config.bEnableLogging ? MF_ENABLED : MF_GRAYED);
SetIngameMenuItemStates(menu, GetUIState());
if (lastGlobalUIState == GetUIState() && lastCoreState == coreState)
@ -1382,7 +1379,6 @@ namespace MainWindow {
bool isPaused = Core_IsStepping() && GetUIState() == UISTATE_INGAME;
TranslateMenuItem(menu, ID_TOGGLE_BREAK, L"\tF8", isPaused ? "Run" : "Break");
TranslateMenuItem(menu, ID_EMULATION_CHAT, L"\tCtrl+C", g_Config.bEnableNetworkChat ? "Open Chat" : "Enable Chat");
}
void UpdateSwitchUMD() {

2
Windows/ppsspp.rc
View file

@ -664,7 +664,7 @@ BEGIN
MENUITEM "", 0, MFT_SEPARATOR
MENUITEM "Enable Cheats", ID_EMULATION_CHEATS
MENUITEM "", 0, MFT_SEPARATOR
MENUITEM "Enable Chat", ID_EMULATION_CHAT
MENUITEM "Open Chat", ID_EMULATION_CHAT
END
POPUP "Help", ID_HELP_MENU