otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'alederer/multiKeybind'

Browse source
This commit is contained in:
tildearrow 2024-09-29 15:38:35 -05:00
commit 03c003276c
8 changed files with 522 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/commandPalette.cpp
View file

@ -192,7 +192,7 @@ void FurnaceGUI::drawPalette() {
switch (curPaletteType) {
case CMDPAL_TYPE_MAIN:
for (int i=0; i<GUI_ACTION_MAX; i++) {
if (guiActions[i].defaultBind==-1) continue; // not a bind
if (guiActions[i].isNotABind()) continue;
Evaluate(i,guiActions[i].friendlyName,strlen(guiActions[i].friendlyName));
}
break;
@ -324,7 +324,7 @@ void FurnaceGUI::drawPalette() {
if (curPaletteType==CMDPAL_TYPE_MAIN) {
ImGui::TableNextColumn();
ImGui::TextColored(uiColors[GUI_COLOR_TEXT_DISABLED], "%s", getKeyName(actionKeys[paletteSearchResults[i].id], true).c_str());
ImGui::TextColored(uiColors[GUI_COLOR_TEXT_DISABLED], "%s", getMultiKeysName(actionKeys[paletteSearchResults[i].id].data(),actionKeys[paletteSearchResults[i].id].size(),true).c_str());
}
if (selectable) {