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

fix sample list right-click only working on name

Browse source 
by moving the context item code to the selectable
This commit is contained in:
Eknous-P 2025-08-13 21:50:51 +04:00 committed by tildearrow
parent aa7ab87b21
commit 43b369495b
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gui/dataList.cpp
View file

@ -286,25 +286,6 @@ void FurnaceGUI::sampleListItem(int i, int dir, int asset) {
nextWindow=GUI_WINDOW_SAMPLE_EDIT; nextWindow=GUI_WINDOW_SAMPLE_EDIT;
} }
} }
if (sampleListDir || (settings.unifiedDataView && insListDir)) {
DIR_DRAG_SOURCE(dir,asset,"FUR_SDIR");
DIR_DRAG_TARGET(dir,asset,e->song.sampleDir,"FUR_SDIR");
} else {
SIMPLE_DRAG_SOURCE("FUR_SAMPLE",sampleToMove);
SIMPLE_DRAG_TARGET("FUR_SAMPLE",sampleToMove,curSample,e->swapSamples,e->moveSampleUp,e->moveSampleDown);
}
ImGui::SameLine();
ImGui::TextNoHashHide("%s",sample->name.c_str());
if (memWarning) {
ImGui::SameLine();
ImGui::Text(ICON_FA_EXCLAMATION_TRIANGLE);
if (ImGui::IsItemHovered() && !mobileUI) {
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]);
ImGui::SetTooltip(_("out of memory for this sample!"));
ImGui::PopStyleColor();
}
ImGui::PopStyleColor();
}
if (ImGui::BeginPopupContextItem("SampleRightMenu")) { if (ImGui::BeginPopupContextItem("SampleRightMenu")) {
curSample=i; curSample=i;
samplePos=0; samplePos=0;
@ -335,6 +316,25 @@ void FurnaceGUI::sampleListItem(int i, int dir, int asset) {
ImGui::PopStyleColor(); ImGui::PopStyleColor();
ImGui::EndPopup(); ImGui::EndPopup();
} }
if (sampleListDir || (settings.unifiedDataView && insListDir)) {
DIR_DRAG_SOURCE(dir,asset,"FUR_SDIR");
DIR_DRAG_TARGET(dir,asset,e->song.sampleDir,"FUR_SDIR");
} else {
SIMPLE_DRAG_SOURCE("FUR_SAMPLE",sampleToMove);
SIMPLE_DRAG_TARGET("FUR_SAMPLE",sampleToMove,curSample,e->swapSamples,e->moveSampleUp,e->moveSampleDown);
}
ImGui::SameLine();
ImGui::TextNoHashHide("%s",sample->name.c_str());
if (memWarning) {
ImGui::SameLine();
ImGui::Text(ICON_FA_EXCLAMATION_TRIANGLE);
if (ImGui::IsItemHovered() && !mobileUI) {
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_TEXT]);
ImGui::SetTooltip(_("out of memory for this sample!"));
ImGui::PopStyleColor();
}
ImGui::PopStyleColor();
}
if (wantScrollListSample && curSample==i) ImGui::SetScrollHereY(); if (wantScrollListSample && curSample==i) ImGui::SetScrollHereY();
ImGui::PopID(); ImGui::PopID();
} }