From b203c3956a7e44832c21dd14dc63c61381a33279 Mon Sep 17 00:00:00 2001
From: YohananDiamond <mitonanan12@gmail.com>
Date: Mon, 31 Jul 2023 16:12:29 -0300
Subject: [PATCH] command palette: improved consistency

---
 src/gui/commandPalette.cpp | 38 +++++++++++++++++---------------------
 src/gui/doAction.cpp       |  4 ++++
 src/gui/gui.cpp            |  2 +-
 src/gui/settings.cpp       |  6 +++++-
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/gui/commandPalette.cpp b/src/gui/commandPalette.cpp
index af38fa1ac..c313a963c 100644
--- a/src/gui/commandPalette.cpp
+++ b/src/gui/commandPalette.cpp
@@ -40,13 +40,6 @@ static inline bool matchFuzzy(const char* haystack,const char* needle) {
 }
 
 void FurnaceGUI::drawPalette() {
-  auto resetPalette = [](FurnaceGUI* g){
-    g->paletteFirstFrame=true;
-    g->paletteQuery="";
-    g->curPaletteChoice=0;
-    g->paletteSearchResults.clear();
-  };
-
   bool accepted=false;
 
   if (paletteFirstFrame)
@@ -55,7 +48,20 @@ void FurnaceGUI::drawPalette() {
   int width=ImGui::GetContentRegionAvail().x;
   ImGui::SetNextItemWidth(width);
 
-  if (ImGui::InputTextWithHint("##CommandPaletteSearch","Search...",&paletteQuery) || paletteFirstFrame) {
+  const char* hint="Search...";
+  switch (curPaletteType) {
+  case CMDPAL_TYPE_RECENT:
+    hint="Search recent files...";
+    break;
+  case CMDPAL_TYPE_INSTRUMENTS:
+    hint="Search instruments...";
+    break;
+  case CMDPAL_TYPE_SAMPLES:
+    hint="Search samples...";
+    break;
+  }
+
+  if (ImGui::InputTextWithHint("##CommandPaletteSearch",hint,&paletteQuery) || paletteFirstFrame) {
     paletteSearchResults.clear();
 
     switch (curPaletteType) {
@@ -121,7 +127,7 @@ void FurnaceGUI::drawPalette() {
       bool current=(i==curPaletteChoice);
       int id=paletteSearchResults[i];
 
-      const char *s="???";
+      const char* s="???";
       switch (curPaletteType) {
       case CMDPAL_TYPE_MAIN:
         s=guiActions[id].friendlyName;
@@ -169,40 +175,30 @@ void FurnaceGUI::drawPalette() {
   paletteFirstFrame=false;
 
   if (accepted) {
-    if (paletteSearchResults.size()==0) {
-      ImGui::CloseCurrentPopup();
-    } else {
+    if (paletteSearchResults.size()>0) {
       int i=paletteSearchResults[curPaletteChoice];
       switch (curPaletteType) {
       case CMDPAL_TYPE_MAIN:
         doAction(i);
-        if (i<GUI_ACTION_CMDPAL_MIN || GUI_ACTION_CMDPAL_MAX<i) {
-          // TODO: maybe instead of this, just re-open the dialog from the doAction code. it'll be much simpler than this corny mess I made
-          ImGui::CloseCurrentPopup();
-        }
         break;
 
       case CMDPAL_TYPE_RECENT:
         openRecentFile(recentFile.at(i));
-        ImGui::CloseCurrentPopup();
         break;
 
       case CMDPAL_TYPE_INSTRUMENTS:
         curIns=i-1;
-        ImGui::CloseCurrentPopup();
         break;
 
       case CMDPAL_TYPE_SAMPLES:
         curSample=i;
-        ImGui::CloseCurrentPopup();
         break;
 
       default:
         logE("invalid command palette type");
-        ImGui::CloseCurrentPopup();
         break;
       };
-      resetPalette(this);
     }
+    ImGui::CloseCurrentPopup();
   }
 }
diff --git a/src/gui/doAction.cpp b/src/gui/doAction.cpp
index 52af29215..600563340 100644
--- a/src/gui/doAction.cpp
+++ b/src/gui/doAction.cpp
@@ -188,14 +188,18 @@ void FurnaceGUI::doAction(int what) {
       break;
     case GUI_ACTION_COMMAND_PALETTE:
       displayPalette=true;
+      curPaletteType=CMDPAL_TYPE_MAIN;
       break;
     case GUI_ACTION_CMDPAL_RECENT:
+      displayPalette=true;
       curPaletteType=CMDPAL_TYPE_RECENT;
       break;
     case GUI_ACTION_CMDPAL_INSTRUMENTS:
+      displayPalette=true;
       curPaletteType=CMDPAL_TYPE_INSTRUMENTS;
       break;
     case GUI_ACTION_CMDPAL_SAMPLES:
+      displayPalette=true;
       curPaletteType=CMDPAL_TYPE_SAMPLES;
       break;
     case GUI_ACTION_WINDOW_EDIT_CONTROLS:
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ee39137b1..c5f5891f2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5203,10 +5203,10 @@ bool FurnaceGUI::loop() {
     }
 
     if (displayPalette) {
+      paletteSearchResults.clear();
       paletteQuery="";
       paletteFirstFrame=true;
       curPaletteChoice=0;
-      curPaletteType=0;
       displayPalette=false;
       ImGui::OpenPopup("Command Palette");
     }
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 6d63af10c..4339d15fc 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -1262,7 +1262,6 @@ void FurnaceGUI::drawSettings() {
         if (ImGui::TreeNode("Window activation")) {
           KEYBIND_CONFIG_BEGIN("keysWindow");
 
-          UI_KEYBIND_CONFIG(GUI_ACTION_COMMAND_PALETTE);
           UI_KEYBIND_CONFIG(GUI_ACTION_WINDOW_EDIT_CONTROLS);
           UI_KEYBIND_CONFIG(GUI_ACTION_WINDOW_ORDERS);
           UI_KEYBIND_CONFIG(GUI_ACTION_WINDOW_INS_LIST);
@@ -1290,6 +1289,11 @@ void FurnaceGUI::drawSettings() {
           UI_KEYBIND_CONFIG(GUI_ACTION_WINDOW_REGISTER_VIEW);
           UI_KEYBIND_CONFIG(GUI_ACTION_WINDOW_LOG);
 
+          UI_KEYBIND_CONFIG(GUI_ACTION_COMMAND_PALETTE);
+          UI_KEYBIND_CONFIG(GUI_ACTION_CMDPAL_RECENT);
+          UI_KEYBIND_CONFIG(GUI_ACTION_CMDPAL_INSTRUMENTS);
+          UI_KEYBIND_CONFIG(GUI_ACTION_CMDPAL_SAMPLES);
+
           UI_KEYBIND_CONFIG(GUI_ACTION_COLLAPSE_WINDOW);
           UI_KEYBIND_CONFIG(GUI_ACTION_CLOSE_WINDOW);