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

Merge branch 'master' into spectrum

Browse source
This commit is contained in:
tildearrow 2025-11-04 16:29:37 -05:00
commit 099db19b03
5 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/gui/multiInsSetup.cpp
View file

@ -53,10 +53,16 @@ void FurnaceGUI::drawMultiInsSetup() {
ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat,true);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
if (ImGui::Button(ICON_FA_CHEVRON_UP "##Up",ImVec2(ImGui::GetContentRegionAvail().x,0))) {
if (i>0) multiInsTranspose[i-1]++;
if (i>0) {
multiInsTranspose[i-1]++;
if (multiInsTranspose[i-1]>60) multiInsTranspose[i-1]=60;
}
}
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
if (i>0) multiInsTranspose[i-1]+=12;
if (i>0) {
multiInsTranspose[i-1]+=12;
if (multiInsTranspose[i-1]>60) multiInsTranspose[i-1]=60;
}
}
ImGui::PopStyleVar();
ImGui::PopItemFlag();
@ -84,10 +90,16 @@ void FurnaceGUI::drawMultiInsSetup() {
ImGui::PushItemFlag(ImGuiItemFlags_ButtonRepeat,true);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
if (ImGui::Button(ICON_FA_CHEVRON_DOWN "##Down",ImVec2(ImGui::GetContentRegionAvail().x,0))) {
if (i>0) multiInsTranspose[i-1]--;
if (i>0) {
multiInsTranspose[i-1]--;
if (multiInsTranspose[i-1]<-60) multiInsTranspose[i-1]=-60;
}
}
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
if (i>0) multiInsTranspose[i-1]-=12;
if (i>0) {
multiInsTranspose[i-1]-=12;
if (multiInsTranspose[i-1]<-60) multiInsTranspose[i-1]=-60;
}
}
ImGui::PopStyleVar();
ImGui::PopItemFlag();

6
src/gui/xyOsc.cpp
View file

@ -39,16 +39,18 @@ void FurnaceGUI::drawXYOsc() {
int xyOscXChannelP1=xyOscXChannel+1;
int xyOscYChannelP1=xyOscYChannel+1;
ImGui::AlignTextToFramePadding();
ImGui::Text(_("X Channel"));
ImGui::SameLine();
if (ImGui::DragInt("##XChannel",&xyOscXChannelP1,1.0f,1,DIV_MAX_OUTPUTS)) {
if (ImGui::InputInt("##XChannel",&xyOscXChannelP1)) {
xyOscXChannel=MIN(MAX(xyOscXChannelP1,1),DIV_MAX_OUTPUTS)-1;
} rightClickable
ImGui::SameLine();
ImGui::Checkbox(_("Invert##X"),&xyOscXInvert);
ImGui::AlignTextToFramePadding();
ImGui::Text(_("Y Channel"));
ImGui::SameLine();
if (ImGui::DragInt("##YChannel",&xyOscYChannelP1,1.0f,1,DIV_MAX_OUTPUTS)) {
if (ImGui::InputInt("##YChannel",&xyOscYChannelP1)) {
xyOscYChannel=MIN(MAX(xyOscYChannelP1,1),DIV_MAX_OUTPUTS)-1;
} rightClickable
ImGui::SameLine();