mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-29 18:54:07 +00:00
Code Issues Projects Releases Wiki Activity

Added text menu code again for Mac and Linux, also fixed a crash bug in the preset search menu.

Browse Source
This commit is contained in:
Kai Blaschke
2021-08-11 23:16:10 +02:00
parent 118d053051
commit 9cb573906c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libprojectM/CMakeLists.txt
View File

@ -1,6 +1,7 @@
add_compile_definitions(
DATADIR_PATH="${PROJECTM_DATADIR_PATH}"
GL_SILENCE_DEPRECATION
USE_TEXT_MENU
)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@ -19,7 +20,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
# Additional preprocessor definitions for Windows builds
add_compile_definitions(
USE_TEXT_MENU
USE_FTGL
USE_NATIVE_GLEW
STBI_NO_DDS

11
src/libprojectM/projectM.cpp
View File

@ -890,7 +890,7 @@ void projectM::selectPrevious(const bool hardCut) {
if (m_presetChooser->empty())
return;
if (isTextInputActive(true) && renderer->m_presetList.size() >= 1)
if (isTextInputActive() && renderer->m_presetList.size() >= 1)
{
// if search menu is up, previous is based on search terms.
if (renderer->m_activePresetID <= 1) {
@ -901,7 +901,7 @@ void projectM::selectPrevious(const bool hardCut) {
else {
// otherwise move back
renderer->m_activePresetID--;
selectPresetByName(renderer->m_presetList[renderer->m_activePresetID-1].name,true);
selectPresetByName(renderer->m_presetList[renderer->m_activePresetID - 1].name,true);
}
} else if (settings().shuffleEnabled && presetHistory.size() >= 1 && static_cast<std::size_t>(presetHistory.back()) != m_presetLoader->size() && !renderer->showmenu) { // if randomly browsing presets, "previous" should return to last random preset not the index--. Avoid returning to size() because that's the idle:// preset.
presetFuture.push_back(m_presetPos->lastIndex());
@ -922,6 +922,7 @@ void projectM::selectPrevious(const bool hardCut) {
void projectM::selectNext(const bool hardCut) {
if (m_presetChooser->empty())
return;
if (isTextInputActive() && renderer->m_presetList.size() >= 1) // if search is active and there are search results
{
// if search menu is down, next is based on search terms.
@ -933,7 +934,7 @@ void projectM::selectNext(const bool hardCut) {
else {
// otherwise move forward
renderer->m_activePresetID++;
selectPresetByName(renderer->m_presetList[renderer->m_activePresetID].name,true);
selectPresetByName(renderer->m_presetList[renderer->m_activePresetID - 1].name,true);
}
} else if (settings().shuffleEnabled && presetFuture.size() >= 1 && static_cast<std::size_t>(presetFuture.front()) != m_presetLoader->size() && !renderer->showmenu) { // if shuffling and we have future presets already stashed then let's go forward rather than truely move randomly.
presetHistory.push_back(m_presetPos->lastIndex());
@ -1161,6 +1162,10 @@ unsigned int projectM::getPresetIndex(std::string& name) const
// load preset based on name
void projectM::selectPresetByName(std::string name, bool hardCut) {
if (name == "")
{
return;
}
unsigned int index = getPresetIndex(name);
if (m_presetChooser->empty()) return;
selectPreset(index);