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

make GUI hide block/f-num in the pitch control mode

Browse source
This commit is contained in:
LTVA1 2024-08-25 17:26:59 +03:00
parent 2118fb3fdd
commit b905671798
1 changed files with 72 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
src/gui/insEdit.cpp
View file

@ -3804,18 +3804,7 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
CENTER_VSLIDER; CENTER_VSLIDER;
bool egtOn=op.egt; bool egtOn=op.egt;
if(egtOn) if(!egtOn)
{
bool susOn=op.sus;
if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER
op.sus=susOn;
}
if(ImGui::IsItemHovered())
{
ImGui::SetTooltip(_("Use op's arpeggio and pitch macros control instead of block/f-num macros"));
}
}
else
{ {
P(CWVSliderScalar("##FINE",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN)); rightClickable P(CWVSliderScalar("##FINE",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN)); rightClickable
} }
@ -3847,8 +3836,9 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
bool amOn=op.am; bool amOn=op.am;
if (ins->type==DIV_INS_OPZ) { if (ins->type==DIV_INS_OPZ) {
bool egtOn=op.egt; bool egtOn=op.egt;
bool susOn=op.sus;
if (egtOn) { if (egtOn) {
ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.0)); ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.5));
} else { } else {
ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*2.0-ImGui::GetStyle().ItemSpacing.y*1.0)); ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*2.0-ImGui::GetStyle().ItemSpacing.y*1.0));
} }
@ -3859,6 +3849,18 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
op.egt=egtOn; op.egt=egtOn;
} }
if (egtOn) { if (egtOn) {
if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER
op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1;
ins->std.opMacros[i].susMacro.vZoom=-1;
}
if(ImGui::IsItemHovered())
{
ImGui::SetTooltip(_("Use op's arpeggio and pitch macros control instead of block/f-num macros"));
}
}
if (egtOn && !susOn) {
int block=op.dt; int block=op.dt;
int freqNum=(op.mult<<4)|(op.dvb&15); int freqNum=(op.mult<<4)|(op.dvb&15);
if (ImGui::InputInt(_("Block"),&block,1,1)) { if (ImGui::InputInt(_("Block"),&block,1,1)) {
@ -4463,27 +4465,30 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
// params // params
ImGui::Separator(); ImGui::Separator();
if (egtOn) { if (egtOn) {
int block=op.dt; if(!op.sus)
int freqNum=(op.mult<<4)|(op.dvb&15); {
ImGui::Text(_("Block")); int block=op.dt;
ImGui::SameLine(); int freqNum=(op.mult<<4)|(op.dvb&15);
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::Text(_("Block"));
ImVec2 cursorAlign=ImGui::GetCursorPos(); ImGui::SameLine();
if (ImGui::InputInt("##Block",&block,1,1)) { ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (block<0) block=0; ImVec2 cursorAlign=ImGui::GetCursorPos();
if (block>7) block=7; if (ImGui::InputInt("##Block",&block,1,1)) {
op.dt=block; if (block<0) block=0;
} if (block>7) block=7;
op.dt=block;
ImGui::Text(_("Freq")); }
ImGui::SameLine();
ImGui::SetCursorPos(ImVec2(cursorAlign.x,ImGui::GetCursorPosY())); ImGui::Text(_("Freq"));
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SameLine();
if (ImGui::InputInt("##FreqNum",&freqNum,1,16)) { ImGui::SetCursorPos(ImVec2(cursorAlign.x,ImGui::GetCursorPosY()));
if (freqNum<0) freqNum=0; ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (freqNum>255) freqNum=255; if (ImGui::InputInt("##FreqNum",&freqNum,1,16)) {
op.mult=freqNum>>4; if (freqNum<0) freqNum=0;
op.dvb=freqNum&15; if (freqNum>255) freqNum=255;
op.mult=freqNum>>4;
op.dvb=freqNum&15;
}
} }
} else { } else {
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -4613,6 +4618,9 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
bool susOn=op.sus; bool susOn=op.sus;
if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER
op.sus=susOn; op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1;
ins->std.opMacros[i].susMacro.vZoom=-1;
} }
if(ImGui::IsItemHovered()) if(ImGui::IsItemHovered())
{ {
@ -4929,6 +4937,9 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER if (ImGui::Checkbox("Pitch control",&susOn)) { PARAMETER
op.sus=susOn; op.sus=susOn;
// HACK: reset zoom and scroll in fixed pitch macros so that they draw correctly
ins->std.opMacros[i].ssgMacro.vZoom=-1;
ins->std.opMacros[i].susMacro.vZoom=-1;
} }
if(ImGui::IsItemHovered()) if(ImGui::IsItemHovered())
{ {
@ -5053,31 +5064,35 @@ void FurnaceGUI::insTabFM(DivInstrument* ins) {
if (ins->type==DIV_INS_OPZ) { if (ins->type==DIV_INS_OPZ) {
if (op.egt) { if (op.egt) {
int block=op.dt; bool susOn=op.sus;
int freqNum=(op.mult<<4)|(op.dvb&15); if(!susOn)
{
int block=op.dt;
int freqNum=(op.mult<<4)|(op.dvb&15);
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (CWSliderInt(FM_NAME(FM_MULT),&block,0,7)) { PARAMETER if (CWSliderInt(FM_NAME(FM_MULT),&block,0,7)) { PARAMETER
if (block<0) block=0; if (block<0) block=0;
if (block>7) block=7; if (block>7) block=7;
op.dt=block; op.dt=block;
} rightClickable } rightClickable
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text("Block"); ImGui::Text("Block");
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
if (CWSliderInt(FM_NAME(FM_FINE),&freqNum,0,255)) { PARAMETER if (CWSliderInt(FM_NAME(FM_FINE),&freqNum,0,255)) { PARAMETER
if (freqNum<0) freqNum=0; if (freqNum<0) freqNum=0;
if (freqNum>255) freqNum=255; if (freqNum>255) freqNum=255;
op.mult=freqNum>>4; op.mult=freqNum>>4;
op.dvb=freqNum&15; op.dvb=freqNum&15;
} rightClickable } rightClickable
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::Text(_("FreqNum")); ImGui::Text(_("FreqNum"));
}
} else { } else {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();