Mixer: Wide bars/invert box moved to reduce height
This commit is contained in:
parent
b95e0691a4
commit
101e2c4383
|
@ -1358,13 +1358,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()-(75.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);
|
||||||
|
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);
|
||||||
|
ImGui::SliderScalar("Panning",ImGuiDataType_S8,&e->song.systemPan[i],&_MINUS_ONE_HUNDRED_TWENTY_SEVEN,&_ONE_HUNDRED_TWENTY_SEVEN);
|
||||||
|
|
||||||
ImGui::PopID();
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1556,12 +1556,10 @@ void FurnaceGUI::drawWaveEdit() {
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
|
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
|
||||||
|
|
||||||
//wavetable graph size determined here
|
ImVec2 contentRegion=ImGui::GetContentRegionAvail(); //wavetable graph size determined here
|
||||||
ImVec2 contentRegion=ImGui::GetContentRegionAvail();
|
|
||||||
if (ImGui::GetContentRegionAvail().y > (ImGui::GetContentRegionAvail().x / 2.0f)) {
|
if (ImGui::GetContentRegionAvail().y > (ImGui::GetContentRegionAvail().x / 2.0f)) {
|
||||||
contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f);
|
contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f);
|
||||||
}
|
}
|
||||||
//ImVec2 contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f); //wavetable graph size determined here
|
|
||||||
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