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

Add extra keys default input when using GUI. 

We also set the extra keys for controller input when using `defaults`
option.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-09-04 15:50:31 -03:00 committed by Rafael Kitover
parent b358c051c9
commit 54991c5b14
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wx/guiinit.cpp
View File

@ -1672,6 +1672,9 @@ public:
if (defkeys_joystick[i].joy) if (defkeys_joystick[i].joy)
a.push_back(defkeys_joystick[i]); a.push_back(defkeys_joystick[i]);
if (extrakeys_joystick[i].joy)
a.push_back(extrakeys_joystick[i]);
tc->SetValue(wxJoyKeyTextCtrl::ToString(a)); tc->SetValue(wxJoyKeyTextCtrl::ToString(a));
} }
} }

1
src/wx/opts.h
View File

@ -5,6 +5,7 @@
extern const wxString joynames[NUM_KEYS]; extern const wxString joynames[NUM_KEYS];
extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults
extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults
extern wxJoyKeyBinding extrakeys_joystick[NUM_KEYS];// extra joystick defaults
extern struct opts_t { extern struct opts_t {
opts_t(); opts_t();