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

GUI: new pattern cursor logic, part 3

Browse source
This commit is contained in:
tildearrow 2025-06-28 02:17:40 -05:00
parent 3cb9fbefaa
commit 9646eb9028
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/gui.cpp
View file

@ -8846,6 +8846,10 @@ FurnaceGUI::FurnaceGUI():
fadeMax(255), fadeMax(255),
collapseAmount(2), collapseAmount(2),
randomizeEffectVal(0), randomizeEffectVal(0),
topMostOrder(-1),
topMostRow(-1),
bottomMostOrder(-1),
bottomMostRow(-1),
playheadY(0.0f), playheadY(0.0f),
scaleMax(100.0f), scaleMax(100.0f),
fadeMode(false), fadeMode(false),

2
src/gui/gui.h
View file

@ -2560,6 +2560,8 @@ class FurnaceGUI {
SelectionPoint sel1, sel2; SelectionPoint sel1, sel2;
int dummyRows; int dummyRows;
int transposeAmount, randomizeMin, randomizeMax, fadeMin, fadeMax, collapseAmount, randomizeEffectVal; int transposeAmount, randomizeMin, randomizeMax, fadeMin, fadeMax, collapseAmount, randomizeEffectVal;
int topMostOrder, topMostRow;
int bottomMostOrder, bottomMostRow;
float playheadY; float playheadY;
float scaleMax; float scaleMax;
bool fadeMode, randomMode, haveHitBounds, randomizeEffect; bool fadeMode, randomMode, haveHitBounds, randomizeEffect;

33
src/gui/pattern.cpp
View file

@ -94,6 +94,16 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
if (i<0 || i>=e->curSubSong->patLen) { if (i<0 || i>=e->curSubSong->patLen) {
return; return;
} }
// set the top-most and bottom-most Y positions
if (topMostOrder==-1) {
topMostOrder=ord;
}
if (topMostRow==-1) {
topMostRow=i;
}
bottomMostOrder=ord;
bottomMostRow=i;
// stuff
bool isPushing=false; bool isPushing=false;
ImVec4 activeColor=uiColors[GUI_COLOR_PATTERN_ACTIVE]; ImVec4 activeColor=uiColors[GUI_COLOR_PATTERN_ACTIVE];
ImVec4 inactiveColor=uiColors[GUI_COLOR_PATTERN_INACTIVE]; ImVec4 inactiveColor=uiColors[GUI_COLOR_PATTERN_INACTIVE];
@ -447,6 +457,13 @@ void FurnaceGUI::drawPattern() {
sel2.xFine^=sel1.xFine; sel2.xFine^=sel1.xFine;
} }
/*
topMostOrder=-1;
topMostRow=-1;
bottomMostOrder=-1;
bottomMostRow=-1;
*/
ImVec2 origWinPadding=ImGui::GetStyle().WindowPadding; ImVec2 origWinPadding=ImGui::GetStyle().WindowPadding;
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0.0f,0.0f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0.0f,0.0f));
if (mobileUI) { if (mobileUI) {
@ -519,7 +536,7 @@ void FurnaceGUI::drawPattern() {
if (nextAddScroll!=0.0f) { if (nextAddScroll!=0.0f) {
float newScroll=ImGui::GetScrollY()+nextAddScroll; float newScroll=ImGui::GetScrollY()+nextAddScroll;
// wrap around and go to previous/next pattern if we're about to overflow // wrap around and go to previous/next pattern if we're about to go beyond the view
if (newScroll<0.0f && curOrder>0) { if (newScroll<0.0f && curOrder>0) {
ImGui::SetScrollY(ImGui::GetScrollMaxY()+newScroll); ImGui::SetScrollY(ImGui::GetScrollMaxY()+newScroll);
setOrder(curOrder-1); setOrder(curOrder-1);
@ -529,6 +546,17 @@ void FurnaceGUI::drawPattern() {
} else { } else {
ImGui::SetScrollY(newScroll); ImGui::SetScrollY(newScroll);
} }
// select in empty space
logV("T: %d,%d B: %d,%d",topMostOrder,topMostRow,bottomMostOrder,bottomMostRow);
if (nextAddScroll>0.0f) {
logW("DOWN");
updateSelection(selEnd.xCoarse,selEnd.xFine,bottomMostRow,bottomMostOrder);
} else {
logW("UP");
updateSelection(selEnd.xCoarse,selEnd.xFine,topMostRow,topMostOrder);
}
nextScroll=-1.0f; nextScroll=-1.0f;
nextAddScroll=0.0f; nextAddScroll=0.0f;
} }
@ -1186,6 +1214,9 @@ void FurnaceGUI::drawPattern() {
dummyRows=(ImGui::GetWindowSize().y/lineHeight)/2; dummyRows=(ImGui::GetWindowSize().y/lineHeight)/2;
topMostOrder=-1;
topMostRow=-1;
// オップナー2608 i owe you one more for this horrible code // オップナー2608 i owe you one more for this horrible code
// previous pattern // previous pattern
ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f);