From 9e405e86fa781c27d79bd982eea3f7c2c31922cf Mon Sep 17 00:00:00 2001 From: Eknous-P Date: Sat, 26 Aug 2023 15:49:06 +0400 Subject: [PATCH] improve find/replace --- src/gui/findReplace.cpp | 15 ++++++++++++++- src/gui/guiConst.cpp | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/gui/findReplace.cpp b/src/gui/findReplace.cpp index 60976d31..0e313d0a 100644 --- a/src/gui/findReplace.cpp +++ b/src/gui/findReplace.cpp @@ -811,20 +811,29 @@ void FurnaceGUI::drawFindReplace() { } ImGui::TableNextRow(); ImGui::TableNextColumn(); - if (ImGui::Button(ICON_FA_MINUS "##DelQuery")) { + pushDestColor(); + if (ImGui::Button(ICON_FA_TRASH "##DelQuery")) { eraseIndex=index; } + popDestColor(); + if (ImGui::IsItemHovered()) { + ImGui::SetTooltip("Delete query"); + } ImGui::TableNextColumn(); if (i.effectCount<8) { + pushAddColor(); if (ImGui::Button("Add effect")) { i.effectCount++; } + popAddColor(); } ImGui::TableNextColumn(); if (i.effectCount>0) { + pushDestColor(); if (ImGui::Button("Remove effect")) { i.effectCount--; } + popDestColor(); } ImGui::EndTable(); } @@ -1097,15 +1106,19 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableNextColumn(); ImGui::TableNextColumn(); if (queryReplaceEffectCount<8) { + pushAddColor(); if (ImGui::Button("Add effect")) { queryReplaceEffectCount++; } + popAddColor(); } ImGui::TableNextColumn(); if (queryReplaceEffectCount>0) { + pushDestColor(); if (ImGui::Button("Remove effect")) { queryReplaceEffectCount--; } + popDestColor(); } ImGui::EndTable(); diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 30e03aab..65966bb7 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -810,7 +810,7 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={ D(GUI_COLOR_TOGGLE_ON,"",ImVec4(0.2f,0.6f,0.2f,1.0f)), D(GUI_COLOR_EDITING,"",ImVec4(0.2f,0.1f,0.1f,1.0f)), D(GUI_COLOR_SONG_LOOP,"",ImVec4(0.3f,0.5f,0.8f,0.4f)), - D(GUI_COLOR_ADDITIVE,"",ImVec4(0.12f,0.58f,1.0f,1.0f)), + D(GUI_COLOR_ADDITIVE,"",ImVec4(0.2f,1.0f,0.2f,1.0f)), D(GUI_COLOR_DESTRUCTIVE,"",ImVec4(1.0f,0.2f,0.2f,1.0f)), D(GUI_COLOR_WARNING,"",ImVec4(0.98f,0.98f,0.06f,1.0f)), D(GUI_COLOR_ERROR,"",ImVec4(0.98f,0.06f,0.11f,1.0f)),