piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Block WX input when detecting controls

Browse Source
This commit is contained in:
Michael Ehrenreich
2015-09-20 03:36:24 +02:00
parent 1c502b76a5
commit b4411bd2ef
2 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@ -492,6 +492,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
ciface::Core::Device* const dev = g_controller_interface.FindDevice(m_devq);
if (dev)
{
m_event_filter.BlockEvents(true);
btn->SetLabel(_("[ waiting ]"));
// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
@ -504,6 +505,10 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
SelectControl(ctrl->GetName());
btn->SetLabel(lbl);
// This lets the input events be sent to the filter and discarded before unblocking
wxTheApp->Yield(true);
m_event_filter.BlockEvents(false);
}
}
@ -531,6 +536,7 @@ bool GamepadPage::DetectButton(ControlButton* button)
ciface::Core::Device* const dev = g_controller_interface.FindDevice(controller->default_device);
if (dev)
{
m_event_filter.BlockEvents(true);
button->SetLabel(_("[ waiting ]"));
// This makes the "waiting" text work on Linux. true (only if needed) prevents crash on Windows
@ -548,6 +554,10 @@ bool GamepadPage::DetectButton(ControlButton* button)
g_controller_interface.UpdateReference(button->control_reference, controller->default_device);
success = true;
}
// This lets the input events be sent to the filter and discarded before unblocking
wxTheApp->Yield(true);
m_event_filter.BlockEvents(false);
}
UpdateGUI();
@ -1072,3 +1082,14 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config
Bind(wxEVT_TIMER, &InputConfigDialog::UpdateBitmaps, this);
m_update_timer.Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS);
}
int InputEventFilter::FilterEvent(wxEvent& event)
{
if (m_block && ShouldCatchEventType(event.GetEventType()))
{
event.StopPropagation();
return Event_Processed;
}
return Event_Skip;
}