etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-24 05:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: more sample editor fixes

Browse source
This commit is contained in:
tildearrow 2022-03-22 17:33:54 -05:00
parent 97926c4e5c
commit 8e0119b2d3
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/sampleEdit.cpp
View file

@ -581,9 +581,15 @@ void FurnaceGUI::drawSampleEdit() {
} else { } else {
ImU32 bgColor=ImGui::GetColorU32(ImGuiCol_FrameBg); ImU32 bgColor=ImGui::GetColorU32(ImGuiCol_FrameBg);
ImU32 lineColor=ImGui::GetColorU32(ImGuiCol_PlotLines); ImU32 lineColor=ImGui::GetColorU32(ImGuiCol_PlotLines);
ImU32 centerLineColor=ImAlphaBlendColors(bgColor,ImGui::GetColorU32(ImGuiCol_PlotLines,0.25));
for (int i=0; i<availX*availY; i++) { for (int i=0; i<availX*availY; i++) {
data[i]=bgColor; data[i]=bgColor;
} }
if (availY>0) {
for (int i=availX*(availY>>1); i<availX*(1+(availY>>1)); i++) {
data[i]=centerLineColor;
}
}
unsigned int xCoarse=samplePos; unsigned int xCoarse=samplePos;
unsigned int xFine=0; unsigned int xFine=0;
unsigned int xAdvanceCoarse=sampleZoom; unsigned int xAdvanceCoarse=sampleZoom;
@ -659,7 +665,7 @@ void FurnaceGUI::drawSampleEdit() {
bool drawSelection=false; bool drawSelection=false;
if (!sampleDragMode) { if (!sampleDragMode) {
if (sampleSelStart>=0 && sampleSelEnd>=0 && sampleSelStart!=sampleSelEnd) { if (sampleSelStart>=0 && sampleSelEnd>=0) {
int start=sampleSelStart; int start=sampleSelStart;
int end=sampleSelEnd; int end=sampleSelEnd;
if (start>end) { if (start>end) {
@ -699,13 +705,25 @@ void FurnaceGUI::drawSampleEdit() {
} }
ImDrawList* dl=ImGui::GetWindowDrawList(); ImDrawList* dl=ImGui::GetWindowDrawList();
ImVec2 p1=rectMin; ImVec2 p1=rectMin;
p1.x+=start/sampleZoom-samplePos; p1.x+=(start-samplePos)/sampleZoom;
ImVec2 p2=ImVec2(rectMin.x+end/sampleZoom-samplePos,rectMax.y); ImVec2 p2=ImVec2(rectMin.x+(end-samplePos)/sampleZoom,rectMax.y);
ImVec4 boundColor=uiColors[GUI_COLOR_ACCENT_PRIMARY];
ImVec4 selColor=uiColors[GUI_COLOR_ACCENT_SECONDARY]; ImVec4 selColor=uiColors[GUI_COLOR_ACCENT_SECONDARY];
boundColor.w*=0.5;
selColor.w*=0.25; selColor.w*=0.25;
if (p1.x<rectMin.x) p1.x=rectMin.x;
if (p1.x>rectMax.x) p1.x=rectMax.x;
if (p2.x<rectMin.x) p2.x=rectMin.x;
if (p2.x>rectMax.x) p2.x=rectMax.x;
dl->AddRectFilled(p1,p2,ImGui::GetColorU32(selColor)); dl->AddRectFilled(p1,p2,ImGui::GetColorU32(selColor));
dl->AddLine(ImVec2(p1.x,p1.y),ImVec2(p1.x,p2.y),ImGui::GetColorU32(boundColor));
if (start!=end) {
dl->AddLine(ImVec2(p2.x,p1.y),ImVec2(p2.x,p2.y),ImGui::GetColorU32(boundColor));
}
} }
ImS64 scrollV=samplePos; ImS64 scrollV=samplePos;