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

GUI: fix selection being visible in dummy row area

Browse source
This commit is contained in:
tildearrow 2022-04-20 15:29:07 -05:00
parent dac6231574
commit 5630b69e64
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.h
View file

@ -1101,7 +1101,7 @@ class FurnaceGUI {
float calcBPM(int s1, int s2, float hz); float calcBPM(int s1, int s2, float hz);
void patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache); void patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache, bool inhibitSel);
void actualWaveList(); void actualWaveList();
void actualSampleList(); void actualSampleList();

10
src/gui/pattern.cpp
View file

@ -32,9 +32,9 @@ inline float randRange(float min, float max) {
} }
// draw a pattern row // draw a pattern row
inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache) { inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache, bool inhibitSel) {
static char id[32]; static char id[32];
bool selectedRow=(i>=sel1.y && i<=sel2.y); bool selectedRow=(i>=sel1.y && i<=sel2.y && !inhibitSel);
ImGui::TableNextRow(0,lineHeight); ImGui::TableNextRow(0,lineHeight);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
float cursorPosY=ImGui::GetCursorPos().y-ImGui::GetScrollY(); float cursorPosY=ImGui::GetCursorPos().y-ImGui::GetScrollY();
@ -559,7 +559,7 @@ void FurnaceGUI::drawPattern() {
patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord-1],true); patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord-1],true);
} }
for (int i=0; i<dummyRows-1; i++) { for (int i=0; i<dummyRows-1; i++) {
patternRow(e->song.patLen+i-dummyRows+1,e->isPlaying(),lineHeight,chans,ord-1,patCache); patternRow(e->song.patLen+i-dummyRows+1,e->isPlaying(),lineHeight,chans,ord-1,patCache,true);
} }
} else { } else {
for (int i=0; i<dummyRows-1; i++) { for (int i=0; i<dummyRows-1; i++) {
@ -573,7 +573,7 @@ void FurnaceGUI::drawPattern() {
patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord],true); patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord],true);
} }
for (int i=0; i<e->song.patLen; i++) { for (int i=0; i<e->song.patLen; i++) {
patternRow(i,e->isPlaying(),lineHeight,chans,ord,patCache); patternRow(i,e->isPlaying(),lineHeight,chans,ord,patCache,false);
} }
// next pattern // next pattern
ImGui::BeginDisabled(); ImGui::BeginDisabled();
@ -582,7 +582,7 @@ void FurnaceGUI::drawPattern() {
patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord+1],true); patCache[i]=e->song.pat[i].getPattern(e->song.orders.ord[i][ord+1],true);
} }
for (int i=0; i<=dummyRows; i++) { for (int i=0; i<=dummyRows; i++) {
patternRow(i,e->isPlaying(),lineHeight,chans,ord+1,patCache); patternRow(i,e->isPlaying(),lineHeight,chans,ord+1,patCache,true);
} }
} else { } else {
for (int i=0; i<=dummyRows; i++) { for (int i=0; i<=dummyRows; i++) {