gearmulator

commit 024359310809127d0ca01d7e0d8ef3f4131dedba
parent 32c5459252a006ed7daeda5522ae6a810c7040d9
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 20 Mar 2022 02:14:33 +0100

support a single pair of prev/next buttons, in which case they toggle the preset for the current part

Diffstat:
M
source/jucePlugin/skins/Trancy/assets.cmake
 | 
2
++
M
source/jucePlugin/ui3/Parts.cpp
 | 
14
++++++++++----

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/source/jucePlugin/skins/Trancy/assets.cmake b/source/jucePlugin/skins/Trancy/assets.cmake
@@ -3,12 +3,14 @@ set(ASSETS_VirusC_Trancy
 	${CMAKE_CURRENT_LIST_DIR}/btn_2.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_3.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_4.png
+	${CMAKE_CURRENT_LIST_DIR}/btn_left.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_main_1.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_main_2.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_main_3.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_main_4.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_main_5.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_menu.png
+	${CMAKE_CURRENT_LIST_DIR}/btn_right.png
 	${CMAKE_CURRENT_LIST_DIR}/btn_save_preset.png
 	${CMAKE_CURRENT_LIST_DIR}/Digital.ttf
 	${CMAKE_CURRENT_LIST_DIR}/knob_1_128.png
diff --git a/source/jucePlugin/ui3/Parts.cpp b/source/jucePlugin/ui3/Parts.cpp
@@ -21,10 +21,10 @@ namespace genericVirusUI
 		{
 			m_partSelect[i]->onClick = [this, i]{ selectPart(i); };
 
-			if(!m_presetPrev.empty())
+			if(i < m_presetPrev.size())
 				m_presetPrev[i]->onClick = [this, i]{ selectPrevPreset(i); };
 
-			if(!m_presetNext.empty())
+			if(i < m_presetNext.size())
 				m_presetNext[i]->onClick = [this, i]{ selectNextPreset(i); };
 
 			m_presetName[i]->onClick = [this, i]{ selectPreset(i); };
@@ -61,8 +61,11 @@ namespace genericVirusUI
 		m_editor.setPart(_part);
 	}
 
-	void Parts::selectPrevPreset(const size_t _part) const
+	void Parts::selectPrevPreset(size_t _part) const
 	{
+		if(m_presetPrev.size() == 1)
+			_part = m_editor.getController().getCurrentPart();
+
 		Virus::Controller& controller = m_editor.getController();
 
 		const auto pt = static_cast<uint8_t>(_part);
@@ -73,8 +76,11 @@ namespace genericVirusUI
 		}
 	}
 
-	void Parts::selectNextPreset(const size_t _part) const
+	void Parts::selectNextPreset(size_t _part) const
 	{
+		if(m_presetNext.size() == 1)
+			_part = m_editor.getController().getCurrentPart();
+
 		Virus::Controller& controller = m_editor.getController();
 
 		const auto pt = static_cast<uint8_t>(_part);