mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 18:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move sd;_gamepad_added event from remap object to GUI object to avoid conflicts with sdl window

Browse Source
This commit is contained in:
rainmakerv3 2025-06-24 22:32:42 +08:00
parent db65bf48c4
commit cd4931b16f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt_gui/control_settings.cpp
View File

@ -779,11 +779,6 @@ bool ControlSettings::eventFilter(QObject* obj, QEvent* event) {
} }
void ControlSettings::processSDLEvents(int Type, int Input, int Value) { void ControlSettings::processSDLEvents(int Type, int Input, int Value) {
if (Type == SDL_EVENT_GAMEPAD_ADDED) {
if (!GameRunning)
CheckGamePad();
}
if (EnableButtonMapping) { if (EnableButtonMapping) {
if (Type == SDL_EVENT_GAMEPAD_BUTTON_DOWN) { if (Type == SDL_EVENT_GAMEPAD_BUTTON_DOWN) {
switch (Input) { switch (Input) {
@ -891,10 +886,19 @@ void ControlSettings::processSDLEvents(int Type, int Input, int Value) {
void ControlSettings::pollSDLEvents() { void ControlSettings::pollSDLEvents() {
SDL_Event event; SDL_Event event;
while (SdlEventWrapper::Wrapper::wrapperActive) { while (SdlEventWrapper::Wrapper::wrapperActive) {
if (!SDL_WaitEvent(&event)) { if (!SDL_WaitEvent(&event)) {
return; return;
} }
if (event.type == SDL_EVENT_QUIT) {
return;
}
if (event.type == SDL_EVENT_GAMEPAD_ADDED) {
CheckGamePad();
}
SdlEventWrapper::Wrapper::GetInstance()->Wrapper::ProcessEvent(&event); SdlEventWrapper::Wrapper::GetInstance()->Wrapper::ProcessEvent(&event);
} }
} }

3
src/qt_gui/sdl_event_wrapper.cpp
View File

@ -22,9 +22,6 @@ bool Wrapper::ProcessEvent(SDL_Event* event) {
case SDL_EVENT_QUIT: case SDL_EVENT_QUIT:
emit SDLEvent(SDL_EVENT_QUIT, 0, 0); emit SDLEvent(SDL_EVENT_QUIT, 0, 0);
return true; return true;
case SDL_EVENT_GAMEPAD_ADDED:
emit SDLEvent(SDL_EVENT_GAMEPAD_ADDED, 0, 0);
return true;
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
emit SDLEvent(SDL_EVENT_GAMEPAD_BUTTON_DOWN, event->gbutton.button, 0); emit SDLEvent(SDL_EVENT_GAMEPAD_BUTTON_DOWN, event->gbutton.button, 0);
return true; return true;