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

color the search characters in the command palette

Browse source
This commit is contained in:
Adam Lederer 2024-08-29 19:46:37 -07:00
parent e44a6561c3
commit 29526d47fb
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/commandPalette.cpp
View file

@ -50,6 +50,7 @@ static bool charMatch(const char* a, const char* b) {
} }
// #define MATCH_GREEDY // #define MATCH_GREEDY
// #define RUN_MATCH_TEST
static bool matchFuzzy(const char* haystack, int haystackLen, const char* needle, int needleLen, MatchResult* result) { static bool matchFuzzy(const char* haystack, int haystackLen, const char* needle, int needleLen, MatchResult* result) {
if (needleLen==0) { if (needleLen==0) {
@ -131,6 +132,7 @@ static bool matchFuzzy(const char* haystack, int haystackLen, const char* needle
return false; return false;
} }
#ifdef RUN_MATCH_TEST
static void matchFuzzyTest() { static void matchFuzzyTest() {
String hay="a__i_a_i__o"; String hay="a__i_a_i__o";
String needle="aio"; String needle="aio";
@ -138,6 +140,7 @@ static void matchFuzzyTest() {
matchFuzzy(hay.c_str(), hay.length(), needle.c_str(), needle.length(), &match); matchFuzzy(hay.c_str(), hay.length(), needle.c_str(), needle.length(), &match);
logI( "match.score.charsWithinNeedle: %d", match.score.charsWithinNeedle ); logI( "match.score.charsWithinNeedle: %d", match.score.charsWithinNeedle );
} }
#endif
void FurnaceGUI::drawPalette() { void FurnaceGUI::drawPalette() {
bool accepted=false; bool accepted=false;
@ -167,7 +170,9 @@ void FurnaceGUI::drawPalette() {
break; break;
} }
// matchFuzzyTest(); #ifdef RUN_MATCH_TEST
matchFuzzyTest();
#endif
if (ImGui::InputTextWithHint("##CommandPaletteSearch",hint,&paletteQuery) || paletteFirstFrame) { if (ImGui::InputTextWithHint("##CommandPaletteSearch",hint,&paletteQuery) || paletteFirstFrame) {
paletteSearchResults.clear(); paletteSearchResults.clear();
@ -294,10 +299,25 @@ void FurnaceGUI::drawPalette() {
break; break;
}; };
if (ImGui::Selectable(s.c_str(),current)) { ImGui::PushID(s.c_str());
bool selectable=ImGui::Selectable("##paletteSearchItem",current,ImGuiSelectableFlags_SpanAllColumns|ImGuiSelectableFlags_AllowOverlap);
const char* str=s.c_str();
size_t chCursor=0;
const std::vector<int>& highlights=paletteSearchResults[i].highlightChars;
for (size_t ch=0; ch<highlights.size(); ch++) {
ImGui::SameLine(0.0f,0.0f);
ImGui::Text("%.*s", (int)(highlights[ch]-chCursor), str+chCursor);
ImGui::SameLine(0.0f,0.0f);
ImGui::TextColored(uiColors[GUI_COLOR_ACCENT_PRIMARY], "%.1s", str+highlights[ch]);
chCursor=highlights[ch]+1;
}
ImGui::SameLine(0.0f,0.0f);
ImGui::Text("%.*s", (int)(s.length()-chCursor), str+chCursor);
if (selectable) {
curPaletteChoice=i; curPaletteChoice=i;
accepted=true; accepted=true;
} }
ImGui::PopID();
if ((navigated || paletteFirstFrame) && current) ImGui::SetScrollHereY(); if ((navigated || paletteFirstFrame) && current) ImGui::SetScrollHereY();
} }
} }