mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 16:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DolphinWX: fix input bitmaps not working when background input is off

Browse source
This commit is contained in:
Michael Maltese 2017-07-12 00:11:29 -07:00
commit 0019c34c73
14 changed files with 53 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View file

@ -55,6 +55,7 @@
#include "DolphinWX/Input/GuitarInputConfigDiag.h"
#include "DolphinWX/Input/NunchukInputConfigDiag.h"
#include "DolphinWX/Input/TurntableInputConfigDiag.h"
#include "DolphinWX/UINeedsControllerState.h"
#include "DolphinWX/WxUtils.h"
#include "InputCommon/ControlReference/ControlReference.h"
@ -1259,6 +1260,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config
{
Bind(wxEVT_CLOSE_WINDOW, &InputConfigDialog::OnClose, this);
Bind(wxEVT_BUTTON, &InputConfigDialog::OnCloseButton, this, wxID_CLOSE);
Bind(wxEVT_ACTIVATE, &InputConfigDialog::OnActivate, this);
SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
SetLayoutAdaptationLevel(wxDIALOG_ADAPTATION_STANDARD_SIZER);
@ -1269,6 +1271,12 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config
m_update_timer.Start(PREVIEW_UPDATE_TIME, wxTIMER_CONTINUOUS);
}
void InputConfigDialog::OnActivate(wxActivateEvent& event)
{
// Needed for input bitmaps
SetUINeedsControllerState(event.GetActive());
}
InputEventFilter::InputEventFilter()
{
wxEvtHandler::AddFilter(this);

1
Source/Core/DolphinWX/Input/InputConfigDiag.h
View file

@ -191,6 +191,7 @@ public:
const int port_num = 0);
virtual ~InputConfigDialog() = default;
void OnActivate(wxActivateEvent& event);
void OnClose(wxCloseEvent& event);
void OnCloseButton(wxCommandEvent& event);