ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DolphinWX: Fix threading issues with TAS pad updates

This commit is contained in:
Jeffrey Pfau 2015-05-31 03:06:27 -07:00
parent ff29ffeb66
commit 704f787c5a
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -67,6 +67,7 @@ void TASInputDlg::CreateBaseLayout()
m_buttons_dpad->AddSpacer(20); m_buttons_dpad->AddSpacer(20);
Bind(wxEVT_CLOSE_WINDOW, &TASInputDlg::OnCloseWindow, this); Bind(wxEVT_CLOSE_WINDOW, &TASInputDlg::OnCloseWindow, this);
Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this);
} }
const int TASInputDlg::m_gc_pad_buttons_bitmask[12] = { const int TASInputDlg::m_gc_pad_buttons_bitmask[12] = {
@ -471,14 +472,21 @@ void TASInputDlg::SetStickValue(bool* ActivatedByKeyboard, int* AmountPressed, w
{ {
*AmountPressed = CurrentValue; *AmountPressed = CurrentValue;
*ActivatedByKeyboard = true; *ActivatedByKeyboard = true;
Textbox->SetValue(std::to_string(*AmountPressed));
} }
else if (*ActivatedByKeyboard) else if (*ActivatedByKeyboard)
{ {
*AmountPressed = center; *AmountPressed = center;
*ActivatedByKeyboard = false; *ActivatedByKeyboard = false;
Textbox->SetValue(std::to_string(*AmountPressed));
} }
else
{
return;
}
Textbox->ChangeValue(std::to_string(*AmountPressed));
wxCommandEvent* evt = new wxCommandEvent(wxEVT_TEXT, Textbox->GetId());
evt->SetEventObject(Textbox);
wxQueueEvent(this, evt);
} }
void TASInputDlg::SetSliderValue(Control* control, int CurrentValue) void TASInputDlg::SetSliderValue(Control* control, int CurrentValue)
@ -487,14 +495,22 @@ void TASInputDlg::SetSliderValue(Control* control, int CurrentValue)
{ {
control->value = CurrentValue; control->value = CurrentValue;
control->set_by_keyboard = true; control->set_by_keyboard = true;
control->text->SetValue(std::to_string(CurrentValue)); control->text->ChangeValue(std::to_string(CurrentValue));
} }
else if (control->set_by_keyboard) else if (control->set_by_keyboard)
{ {
control->value = control->default_value; control->value = control->default_value;
control->set_by_keyboard = false; control->set_by_keyboard = false;
control->text->SetValue(std::to_string(control->default_value)); control->text->ChangeValue(std::to_string(control->default_value));
} }
else
{
return;
}
wxCommandEvent* evt = new wxCommandEvent(wxEVT_TEXT, control->text_id);
evt->SetEventObject(control->text);
wxQueueEvent(this, evt);
} }
void TASInputDlg::SetButtonValue(Button* button, bool CurrentState) void TASInputDlg::SetButtonValue(Button* button, bool CurrentState)