Merge pull request #230 from BlastBrothers/master
A few small UI tweaks
This commit is contained in:
commit
dee74e7b14
|
@ -1355,13 +1355,17 @@ void FurnaceGUI::drawMixer() {
|
||||||
signed char vol=e->song.systemVol[i]&127;
|
signed char vol=e->song.systemVol[i]&127;
|
||||||
ImGui::PushID(id);
|
ImGui::PushID(id);
|
||||||
ImGui::Text("%d. %s",i+1,getSystemName(e->song.system[i]));
|
ImGui::Text("%d. %s",i+1,getSystemName(e->song.system[i]));
|
||||||
if (ImGui::SliderScalar("Volume",ImGuiDataType_S8,&vol,&_ZERO,&_ONE_HUNDRED_TWENTY_SEVEN)) {
|
ImGui::SameLine(ImGui::GetWindowWidth()-(82.0f*dpiScale));
|
||||||
e->song.systemVol[i]=(e->song.systemVol[i]&128)|vol;
|
|
||||||
}
|
|
||||||
ImGui::SliderScalar("Panning",ImGuiDataType_S8,&e->song.systemPan[i],&_MINUS_ONE_HUNDRED_TWENTY_SEVEN,&_ONE_HUNDRED_TWENTY_SEVEN);
|
|
||||||
if (ImGui::Checkbox("Invert",&doInvert)) {
|
if (ImGui::Checkbox("Invert",&doInvert)) {
|
||||||
e->song.systemVol[i]^=128;
|
e->song.systemVol[i]^=128;
|
||||||
}
|
}
|
||||||
|
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(50.0f*dpiScale));
|
||||||
|
if (ImGui::SliderScalar("Volume",ImGuiDataType_S8,&vol,&_ZERO,&_ONE_HUNDRED_TWENTY_SEVEN)) {
|
||||||
|
e->song.systemVol[i]=(e->song.systemVol[i]&128)|vol;
|
||||||
|
}
|
||||||
|
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(50.0f*dpiScale));
|
||||||
|
ImGui::SliderScalar("Panning",ImGuiDataType_S8,&e->song.systemPan[i],&_MINUS_ONE_HUNDRED_TWENTY_SEVEN,&_ONE_HUNDRED_TWENTY_SEVEN);
|
||||||
|
|
||||||
ImGui::PopID();
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -730,7 +730,7 @@ void FurnaceGUI::drawInsEdit() {
|
||||||
ImGui::InputText("Name",&ins->name);
|
ImGui::InputText("Name",&ins->name);
|
||||||
if (ins->type<0 || ins->type>23) ins->type=DIV_INS_FM;
|
if (ins->type<0 || ins->type>23) ins->type=DIV_INS_FM;
|
||||||
int insType=ins->type;
|
int insType=ins->type;
|
||||||
if (ImGui::Combo("Type",&insType,insTypes,24)) {
|
if (ImGui::Combo("Type",&insType,insTypes,24,24)) {
|
||||||
ins->type=(DivInstrumentType)insType;
|
ins->type=(DivInstrumentType)insType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -784,8 +784,8 @@ void FurnaceGUI::drawInsEdit() {
|
||||||
ImGui::SetTooltip("Only for Genesis and Neo Geo systems");
|
ImGui::SetTooltip("Only for Genesis and Neo Geo systems");
|
||||||
}
|
}
|
||||||
|
|
||||||
//56.0 controls vert scaling; default 96
|
//52.0 controls vert scaling; default 96
|
||||||
drawFMEnv(op.tl,op.ar,op.dr,op.d2r,op.rr,op.sl,ImVec2(ImGui::GetContentRegionAvail().x,56.0*dpiScale));
|
drawFMEnv(op.tl,op.ar,op.dr,op.d2r,op.rr,op.sl,ImVec2(ImGui::GetContentRegionAvail().x,52.0*dpiScale));
|
||||||
//P(ImGui::SliderScalar(FM_NAME(FM_AR),ImGuiDataType_U8,&op.ar,&_ZERO,&_THIRTY_ONE));
|
//P(ImGui::SliderScalar(FM_NAME(FM_AR),ImGuiDataType_U8,&op.ar,&_ZERO,&_THIRTY_ONE));
|
||||||
if (ImGui::BeginTable("opParams",2,ImGuiTableFlags_SizingStretchProp)) {
|
if (ImGui::BeginTable("opParams",2,ImGuiTableFlags_SizingStretchProp)) {
|
||||||
ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,0.0); \
|
ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,0.0); \
|
||||||
|
@ -1546,7 +1546,7 @@ void FurnaceGUI::drawWaveEdit() {
|
||||||
wavePreview[i]=wave->data[i];
|
wavePreview[i]=wave->data[i];
|
||||||
}
|
}
|
||||||
if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
|
if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
|
||||||
|
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); //wavetable text input size found here
|
||||||
if (ImGui::InputText("##MMLWave",&mmlStringW)) {
|
if (ImGui::InputText("##MMLWave",&mmlStringW)) {
|
||||||
decodeMMLStrW(mmlStringW,wave->data,wave->len,wave->max);
|
decodeMMLStrW(mmlStringW,wave->data,wave->len,wave->max);
|
||||||
}
|
}
|
||||||
|
@ -1555,7 +1555,11 @@ void FurnaceGUI::drawWaveEdit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
|
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
|
||||||
ImVec2 contentRegion=ImGui::GetContentRegionAvail();
|
|
||||||
|
ImVec2 contentRegion=ImGui::GetContentRegionAvail(); //wavetable graph size determined here
|
||||||
|
if (ImGui::GetContentRegionAvail().y > (ImGui::GetContentRegionAvail().x / 2.0f)) {
|
||||||
|
contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f);
|
||||||
|
}
|
||||||
PlotNoLerp("##Waveform",wavePreview,wave->len+1,0,NULL,0,wave->max,contentRegion);
|
PlotNoLerp("##Waveform",wavePreview,wave->len+1,0,NULL,0,wave->max,contentRegion);
|
||||||
if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
|
if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
|
||||||
waveDragStart=ImGui::GetItemRectMin();
|
waveDragStart=ImGui::GetItemRectMin();
|
||||||
|
|
Loading…
Reference in New Issue