xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve order of definition of mappings when listing them

Browse Source 
Fixes #1479
Closes #1494
This commit is contained in:
Maxime Coste 2017-07-11 09:49:35 +09:00
parent ebc1e054fc
commit 42e5d95cd8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/keymap_manager.cc
View File

@ -16,7 +16,7 @@ void KeymapManager::map_key(Key key, KeymapMode mode,
void KeymapManager::unmap_key(Key key, KeymapMode mode) void KeymapManager::unmap_key(Key key, KeymapMode mode)
{ {
m_mapping.unordered_remove(KeyAndMode{key, mode}); m_mapping.remove(KeyAndMode{key, mode});
} }
@ -43,11 +43,9 @@ KeymapManager::KeyList KeymapManager::get_mapped_keys(KeymapMode mode) const
res = m_parent->get_mapped_keys(mode); res = m_parent->get_mapped_keys(mode);
for (auto& map : m_mapping) for (auto& map : m_mapping)
{ {
if (map.key.second == mode) if (map.key.second == mode and not contains(res, map.key.first))
res.emplace_back(map.key.first); res.emplace_back(map.key.first);
} }
std::sort(res.begin(), res.end());
res.erase(std::unique(res.begin(), res.end()), res.end());
return res; return res;
} }