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

GUI: fix text hiding after hash in ins/sample list

Browse source
This commit is contained in:
tildearrow 2024-07-14 02:27:35 -05:00
parent 3449dfdea2
commit 871c260bc1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/dataList.cpp
View file

@ -156,14 +156,14 @@ void FurnaceGUI::insListItem(int i, int dir, int asset) {
if (i<(int)e->song.ins.size()) { if (i<(int)e->song.ins.size()) {
DivInstrument* ins=e->song.ins[i]; DivInstrument* ins=e->song.ins[i];
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("%.2X: %s",i,ins->name.c_str()); ImGui::TextNoHashHide("%.2X: %s",i,ins->name.c_str());
} else { } else {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("%.2X: <INVALID>",i); ImGui::TextNoHashHide("%.2X: <INVALID>",i);
} }
} else { } else {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("- None -"); ImGui::TextNoHashHide("- None -");
} }
ImGui::PopID(); ImGui::PopID();
ImGui::PopStyleColor(); ImGui::PopStyleColor();
@ -219,7 +219,7 @@ void FurnaceGUI::sampleListItem(int i, int dir, int asset) {
if (memWarning) break; if (memWarning) break;
} }
if (memWarning) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_SAMPLE_CHIP_WARNING]); if (memWarning) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_SAMPLE_CHIP_WARNING]);
if (ImGui::Selectable(fmt::sprintf("%d: %s##_SAM%d",i,sample->name,i).c_str(),curSample==i)) { if (ImGui::Selectable(fmt::sprintf("%d:##_SAM%d",i,i).c_str(),curSample==i)) {
curSample=i; curSample=i;
samplePos=0; samplePos=0;
updateSampleTex=true; updateSampleTex=true;
@ -235,6 +235,8 @@ void FurnaceGUI::sampleListItem(int i, int dir, int asset) {
DRAG_SOURCE(dir,asset,"FUR_SDIR"); DRAG_SOURCE(dir,asset,"FUR_SDIR");
DRAG_TARGET(dir,asset,e->song.sampleDir,"FUR_SDIR"); DRAG_TARGET(dir,asset,e->song.sampleDir,"FUR_SDIR");
} }
ImGui::SameLine();
ImGui::TextNoHashHide("%s",sample->name.c_str());
if (memWarning) { if (memWarning) {
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text(ICON_FA_EXCLAMATION_TRIANGLE); ImGui::Text(ICON_FA_EXCLAMATION_TRIANGLE);