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

fix not working erase button

This commit is contained in:
thrust26 2019-05-26 10:39:26 +02:00
parent 97dfbd9fe8
commit 308cc1864d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/PKeyboardHandler.cxx
View File

@ -45,23 +45,27 @@ PhysicalKeyboardHandler::PhysicalKeyboardHandler(
myUseCtrlKeyFlag(myOSystem.settings().getBool("ctrlcombo")) myUseCtrlKeyFlag(myOSystem.settings().getBool("ctrlcombo"))
{ {
string list = myOSystem.settings().getString("keymap_emu"); string list = myOSystem.settings().getString("keymap_emu");
int i = myKeyMap.loadMapping(list, kEmulationMode); myKeyMap.loadMapping(list, kEmulationMode);
list = myOSystem.settings().getString("keymap_ui"); list = myOSystem.settings().getString("keymap_ui");
i += myKeyMap.loadMapping(list, kMenuMode); myKeyMap.loadMapping(list, kMenuMode);
setDefaultMapping(Event::NoType, kEmulationMode); setDefaultMapping(Event::NoType, kEmulationMode, true);
setDefaultMapping(Event::NoType, kMenuMode); setDefaultMapping(Event::NoType, kMenuMode, true);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mode) void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mode, bool updateDefaults)
{ {
// If event is 'NoType', check for missing default mappings // If event is 'NoType', erase and reset all mappings
bool defaultMissing = (event == Event::NoType); // Otherwise, only reset the given event
bool eraseAll = !updateDefaults && (event == Event::NoType);
if (eraseAll)
// Erase all mappings of given mode
myKeyMap.eraseMode(mode);
auto setDefaultKey = [&](Event::Type k_event, StellaKey key, int mod = KBDM_NONE) auto setDefaultKey = [&](Event::Type k_event, StellaKey key, int mod = KBDM_NONE)
{ {
if (defaultMissing) if (updateDefaults)
{ {
// if there is no existing mapping for the event and // if there is no existing mapping for the event and
// the default mapping for the event is unused, set default key for event // the default mapping for the event is unused, set default key for event
@ -71,7 +75,7 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
myKeyMap.add(k_event, mode, key, mod); myKeyMap.add(k_event, mode, key, mod);
} }
} }
else if (k_event == event) else if (eraseAll || k_event == event)
{ {
myKeyMap.eraseEvent(k_event, mode); myKeyMap.eraseEvent(k_event, mode);
myKeyMap.add(k_event, mode, key, mod); myKeyMap.add(k_event, mode, key, mod);

2
src/common/PKeyboardHandler.hxx
View File

@ -45,7 +45,7 @@ class PhysicalKeyboardHandler
PhysicalKeyboardHandler(OSystem& system, EventHandler& handler, Event& event); PhysicalKeyboardHandler(OSystem& system, EventHandler& handler, Event& event);
void setDefaultMapping(Event::Type type, EventMode mode); void setDefaultMapping(Event::Type type, EventMode mode, bool updateDefaults = false);
void eraseMapping(Event::Type event, EventMode mode); void eraseMapping(Event::Type event, EventMode mode);
void saveMapping(); void saveMapping();
string getMappingDesc(Event::Type, EventMode mode) const; string getMappingDesc(Event::Type, EventMode mode) const;