Skip to content

fix for colorselect #289

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

Merged
merged 2 commits into from
Feb 5, 2025
Merged

fix for colorselect #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef59ca
fix for colorselect
LivingSynthesis Feb 5, 2025
c673b84
left a line by mistake
LivingSynthesis Feb 5, 2025
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: 6 additions & 0 deletions VortexEngine/src/Menus/Menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ void Menu::nextBulbSelection()
}
}

void Menu::bypassLedSelection(LedMap map) {
m_ledSelected = true;
m_targetLeds = map;
onLedSelected();
}

void Menu::onLedSelected()
{
}
Expand Down
2 changes: 2 additions & 0 deletions VortexEngine/src/Menus/Menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ class Menu
// iterate to next bulb selection
void nextBulbSelection();

//skip led selection
void bypassLedSelection(LedMap map);
// an overridable api that allows derived menus to decide which led selections
// should be available before they have actually opened
virtual bool isValidLedSelection(LedMap selection) const { return true; }
Expand Down
3 changes: 1 addition & 2 deletions VortexEngine/src/Menus/MenuList/ColorSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ bool ColorSelect::init()
return false;
}
if (cur->isMultiLed()) {
m_targetLeds = MAP_LED(LED_MULTI);
m_ledSelected = true;
bypassLedSelection(MAP_LED(LED_MULTI));
}
m_state = STATE_INIT;
DEBUG_LOG("Entered color select");
Expand Down