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

GUI: allow pulling selection in sample editor

Browse source
This commit is contained in:
tildearrow 2023-05-05 02:56:52 -05:00
parent 565f67dd0f
commit 51414203b9
3 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/gui.cpp
View file

@ -6735,6 +6735,7 @@ FurnaceGUI::FurnaceGUI():
sampleDragMode(false), sampleDragMode(false),
sampleDrag16(false), sampleDrag16(false),
sampleZoomAuto(true), sampleZoomAuto(true),
sampleSelTarget(0),
sampleDragTarget(NULL), sampleDragTarget(NULL),
sampleDragStart(0,0), sampleDragStart(0,0),
sampleDragAreaSize(0,0), sampleDragAreaSize(0,0),

3
src/gui/gui.h
View file

@ -1813,6 +1813,9 @@ class FurnaceGUI {
int sampleSelStart, sampleSelEnd; int sampleSelStart, sampleSelEnd;
bool sampleInfo, sampleCompatRate; bool sampleInfo, sampleCompatRate;
bool sampleDragActive, sampleDragMode, sampleDrag16, sampleZoomAuto; bool sampleDragActive, sampleDragMode, sampleDrag16, sampleZoomAuto;
// 0: start
// 1: end
unsigned char sampleSelTarget;
void* sampleDragTarget; void* sampleDragTarget;
ImVec2 sampleDragStart; ImVec2 sampleDragStart;
ImVec2 sampleDragAreaSize; ImVec2 sampleDragAreaSize;

45
src/gui/sampleEdit.cpp
View file

@ -1224,6 +1224,31 @@ void FurnaceGUI::drawSampleEdit() {
ImVec2 rectMax=ImGui::GetItemRectMax(); ImVec2 rectMax=ImGui::GetItemRectMax();
ImVec2 rectSize=ImGui::GetItemRectSize(); ImVec2 rectSize=ImGui::GetItemRectSize();
unsigned char selectTarget=255;
if (ImGui::IsItemHovered()) {
int start=sampleSelStart;
int end=sampleSelEnd;
if (start>end) {
start^=end;
end^=start;
start^=end;
}
ImVec2 p1=rectMin;
p1.x+=(start-samplePos)/sampleZoom;
ImVec2 p2=ImVec2(rectMin.x+(end-samplePos)/sampleZoom,rectMax.y);
ImVec2 mousePos=ImGui::GetMousePos();
if (p1.x>=rectMin.x && p1.x<=rectMax.x && fabs(mousePos.x-p1.x)<2.0*dpiScale) {
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeEW);
selectTarget=0;
} else if (p2.x>=rectMin.x && p2.x<=rectMax.x && fabs(mousePos.x-p2.x)<2.0*dpiScale) {
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeEW);
selectTarget=1;
}
}
if (ImGui::IsItemClicked()) { if (ImGui::IsItemClicked()) {
nextWindow=GUI_WINDOW_SAMPLE_EDIT; nextWindow=GUI_WINDOW_SAMPLE_EDIT;
if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) { if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
@ -1250,9 +1275,23 @@ void FurnaceGUI::drawSampleEdit() {
} }
sampleDragLen=sample->samples; sampleDragLen=sample->samples;
sampleDragActive=true; sampleDragActive=true;
sampleSelStart=-1; if (!sampleDragMode) {
sampleSelEnd=-1; switch (selectTarget) {
if (sampleDragMode) sample->prepareUndo(true); case 0:
sampleSelStart^=sampleSelEnd;
sampleSelEnd^=sampleSelStart;
sampleSelStart^=sampleSelEnd;
break;
case 1:
break;
default:
sampleSelStart=-1;
sampleSelEnd=-1;
break;
}
} else {
sample->prepareUndo(true);
}
processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y); processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
} }
} }