mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-02 23:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

imgui: gamepad capture, stopping propagation

Browse Source
This commit is contained in:
Vinicius Rangel 2024-09-02 21:58:58 -03:00
parent 752e4032c6
commit d6c0943720
No known key found for this signature in database
GPG Key ID: A5B154D904B761D9
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/imgui/imgui_layer.h
View File

@ -12,6 +12,10 @@ public:
static void RemoveLayer(Layer* layer); static void RemoveLayer(Layer* layer);
virtual void Draw() = 0; virtual void Draw() = 0;
virtual bool ShouldGrabGamepad() {
return false;
}
}; };
} // namespace ImGui } // namespace ImGui

23
src/imgui/renderer/imgui_core.cpp
View File

@ -71,10 +71,7 @@ void Shutdown(const vk::Device& device) {
} }
bool ProcessEvent(SDL_Event* event) { bool ProcessEvent(SDL_Event* event) {
const bool used = Sdl::ProcessEvent(event); Sdl::ProcessEvent(event);
if (!used) {
return false;
}
switch (event->type) { switch (event->type) {
case SDL_EVENT_MOUSE_MOTION: case SDL_EVENT_MOUSE_MOTION:
case SDL_EVENT_MOUSE_WHEEL: case SDL_EVENT_MOUSE_WHEEL:
@ -85,6 +82,15 @@ bool ProcessEvent(SDL_Event* event) {
case SDL_EVENT_KEY_DOWN: case SDL_EVENT_KEY_DOWN:
case SDL_EVENT_KEY_UP: case SDL_EVENT_KEY_UP:
return GetIO().WantCaptureKeyboard; return GetIO().WantCaptureKeyboard;
case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
case SDL_EVENT_GAMEPAD_BUTTON_UP:
case SDL_EVENT_GAMEPAD_AXIS_MOTION:
case SDL_EVENT_GAMEPAD_ADDED:
case SDL_EVENT_GAMEPAD_REMOVED:
case SDL_EVENT_GAMEPAD_TOUCHPAD_DOWN:
case SDL_EVENT_GAMEPAD_TOUCHPAD_UP:
case SDL_EVENT_GAMEPAD_TOUCHPAD_MOTION:
return (GetIO().BackendFlags & ImGuiBackendFlags_HasGamepad) != 0;
default: default:
return false; return false;
} }
@ -109,8 +115,17 @@ void NewFrame() {
Sdl::NewFrame(); Sdl::NewFrame();
ImGui::NewFrame(); ImGui::NewFrame();
bool capture_gamepad = false;
for (auto* layer : layers) { for (auto* layer : layers) {
layer->Draw(); layer->Draw();
if (layer->ShouldGrabGamepad()) {
capture_gamepad = true;
}
}
if (capture_gamepad) {
GetIO().BackendFlags |= ImGuiBackendFlags_HasGamepad;
} else {
GetIO().BackendFlags &= ~ImGuiBackendFlags_HasGamepad;
} }
} }