Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix kit row audition pad rendering in automation view and kit row audition pad usage in menu #1525

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Bugfix kit row audition pad rendering in automation view and kit row audition pad usage in menu #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/deluge/gui/views/automation_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ void AutomationView::renderLove(RGB* image, uint8_t occupancyMask[], int32_t yDi
}
}

// defers to audio clip or instrument clip sidebar render functions
// defers to arranger, audio clip or instrument clip sidebar render functions
// depending on the active clip
bool AutomationView::renderSidebar(uint32_t whichRows, RGB image[][kDisplayWidth + kSideBarWidth],
uint8_t occupancyMask[][kDisplayWidth + kSideBarWidth]) {
Expand Down Expand Up @@ -2204,10 +2204,6 @@ void AutomationView::auditionPadAction(int32_t velocity, int32_t yDisplay, bool
drum = modelStackWithNoteRowOnCurrentClip->getNoteRow()->drum;
Drum* selectedDrum = ((Kit*)output)->selectedDrum;
if (selectedDrum != drum) {
// But not if we're actually not on this screen
if (getCurrentUI() != this) {
return;
}
selectedDrumChanged = true;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/deluge/gui/views/instrument_clip_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4252,8 +4252,12 @@ void InstrumentClipView::drawAuditionSquare(uint8_t yDisplay, RGB thisImage[]) {

// Kit - draw "selected Drum"
if (getCurrentOutputType() == OutputType::KIT) {
if (getCurrentUI() != this) {
// we're not the top-level UI, just turn the pad off
// only turn selected drum off if we're not currently in that UI and affect entire is on
// we turn it off when affect entire is on because the selected drum is not relevant in that context
// e.g. if you're in the affect entire menu, you're not editing params for the selected drum
UI* currentUI = getCurrentUI();
bool isInstrumentClipView = ((currentUI == &instrumentClipView) || (currentUI == &automationView));
if (!isInstrumentClipView && instrumentClipView.getAffectEntire()) {
thisColour = colours::black;
return;
}
Expand Down
Loading