etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Yet more vertical centering of labels.

This commit is contained in:
Electric Keet 2023-08-06 22:47:17 -07:00
parent 1ea4452e9b
commit 3effd9e506
7 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/insEdit.cpp
View File

@ -4264,6 +4264,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::EndTabItem();
}
if (ins->type==DIV_INS_C64) if (ImGui::BeginTabItem("C64")) {
ImGui::AlignTextToFramePadding();
ImGui::Text("Waveform");
ImGui::SameLine();
pushToggleColors(ins->c64.triOn);
@ -4348,6 +4349,7 @@ void FurnaceGUI::drawInsEdit() {
P(CWSliderScalar("Cutoff",ImGuiDataType_U16,&ins->c64.cut,&_ZERO,&_TWO_THOUSAND_FORTY_SEVEN)); rightClickable
P(CWSliderScalar("Resonance",ImGuiDataType_U8,&ins->c64.res,&_ZERO,&_FIFTEEN)); rightClickable
ImGui::AlignTextToFramePadding();
ImGui::Text("Filter Mode");
ImGui::SameLine();
pushToggleColors(ins->c64.lp);
@ -5250,6 +5252,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Wave 1");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -5260,6 +5263,7 @@ void FurnaceGUI::drawInsEdit() {
}
if (isSingleWaveFX) {
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Wave 2");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);

8
src/gui/sampleEdit.cpp
View File

@ -372,6 +372,7 @@ void FurnaceGUI::drawSampleEdit() {
if (sampleInfo) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Type");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -445,6 +446,7 @@ void FurnaceGUI::drawSampleEdit() {
bool coarseChanged=false;
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Hz");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -459,6 +461,7 @@ void FurnaceGUI::drawSampleEdit() {
}
}
ImGui::AlignTextToFramePadding();
ImGui::Text("Note");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -501,6 +504,7 @@ void FurnaceGUI::drawSampleEdit() {
}
}
ImGui::AlignTextToFramePadding();
ImGui::Text("Fine");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -537,6 +541,7 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::TableNextColumn();
ImGui::BeginDisabled(!(doLoop || keepLoopAlive));
keepLoopAlive=false;
ImGui::AlignTextToFramePadding();
ImGui::Text("Mode");
ImGui::SameLine();
pushWarningColor(!warnLoopMode.empty());
@ -560,6 +565,7 @@ void FurnaceGUI::drawSampleEdit() {
popWarningColor();
pushWarningColor(!warnLoopPos.empty());
ImGui::AlignTextToFramePadding();
ImGui::Text("Start");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -585,6 +591,7 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::SetTooltip("%s",warnLoopPos.c_str());
}
ImGui::AlignTextToFramePadding();
ImGui::Text("End");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -1018,6 +1025,7 @@ void FurnaceGUI::drawSampleEdit() {
if (sampleFilterRes<0.0f) sampleFilterRes=0.0f;
if (sampleFilterRes>0.99f) sampleFilterRes=0.99f;
}
ImGui::AlignTextToFramePadding();
ImGui::Text("Power");
ImGui::SameLine();
if (ImGui::RadioButton("1x",sampleFilterPower==1)) {

5
src/gui/songInfo.cpp
View File

@ -36,6 +36,7 @@ void FurnaceGUI::drawSongInfo(bool asChild) {
ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.0);
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Name");
ImGui::TableNextColumn();
float avail=ImGui::GetContentRegionAvail().x;
@ -59,6 +60,7 @@ void FurnaceGUI::drawSongInfo(bool asChild) {
}
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Author");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(avail);
@ -68,6 +70,7 @@ void FurnaceGUI::drawSongInfo(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Album");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(avail);
@ -77,6 +80,7 @@ void FurnaceGUI::drawSongInfo(bool asChild) {
if (!basicMode) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("System");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(MAX(16.0f*dpiScale,avail-autoButtonSize-ImGui::GetStyle().ItemSpacing.x));
@ -112,6 +116,7 @@ void FurnaceGUI::drawSongInfo(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Tuning (A-4)");
ImGui::TableNextColumn();
float tune=e->song.tuning;

7
src/gui/speed.cpp
View File

@ -37,6 +37,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
if (ImGui::SmallButton(tempoView?"Base Tempo##TempoOrHz":"Tick Rate##TempoOrHz")) {
tempoView=!tempoView;
}
@ -74,6 +75,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
if (keepGrooveAlive || e->curSubSong->speeds.len>2) {
if (ImGui::SmallButton("Groove")) {
e->lockEngine([this]() {
@ -163,6 +165,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
if (!basicMode) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Virtual Tempo");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(halfAvail);
@ -185,6 +188,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Divider");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(halfAvail);
@ -200,6 +204,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Highlight");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(halfAvail);
@ -222,6 +227,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.0);
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Pattern Length");
ImGui::TableNextColumn();
float avail=ImGui::GetContentRegionAvail().x;
@ -236,6 +242,7 @@ void FurnaceGUI::drawSpeed(bool asChild) {
if (!basicMode) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Song Length");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(avail);

2
src/gui/stats.cpp
View File

@ -32,6 +32,7 @@ void FurnaceGUI::drawStats() {
size_t lastProcTime=e->processTime;
double maxGot=1000000000.0*(double)e->getAudioDescGot().bufsize/(double)e->getAudioDescGot().rate;
String procStr=fmt::sprintf("%.1f%%",100.0*((double)lastProcTime/(double)maxGot));
ImGui::AlignTextToFramePadding();
ImGui::Text("Audio load");
ImGui::SameLine();
ImGui::ProgressBar((double)lastProcTime/maxGot,ImVec2(-FLT_MIN,0),procStr.c_str());
@ -47,6 +48,7 @@ void FurnaceGUI::drawStats() {
} else {
usageStr=fmt::sprintf("%d/%d",usage,capacity);
}
ImGui::AlignTextToFramePadding();
ImGui::Text("%s [%d]", e->getSystemName(e->song.system[i]), j);
ImGui::SameLine();
ImGui::ProgressBar(((float)usage)/((float)capacity),ImVec2(-FLT_MIN,0),usageStr.c_str());

1
src/gui/subSongs.cpp
View File

@ -127,6 +127,7 @@ void FurnaceGUI::drawSubSongs(bool asChild) {
ImGui::SetTooltip("Remove");
}
ImGui::AlignTextToFramePadding();
ImGui::Text("Name");
ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);

10
src/gui/waveEdit.cpp
View File

@ -593,6 +593,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Duty");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -602,6 +603,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Exponent");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -611,6 +613,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("XOR Point");
ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -630,6 +633,7 @@ void FurnaceGUI::drawWaveEdit() {
for (int i=0; i<16; i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("%d",i+1);
ImGui::TableNextColumn();
ImGui::PushID(140+i);
@ -683,6 +687,7 @@ void FurnaceGUI::drawWaveEdit() {
for (int i=0; i<4; i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("%d",i+1);
ImGui::TableNextColumn();
@ -727,6 +732,7 @@ void FurnaceGUI::drawWaveEdit() {
for (int i=0; i<4; i++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("%d",i+1);
ImGui::TableNextColumn();
@ -760,6 +766,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("1");
ImGui::TableNextColumn();
if (ImGui::Checkbox("##ConO1",&waveGenFMCon0[0])) {
@ -784,6 +791,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("2");
ImGui::TableNextColumn();
if (ImGui::Checkbox("##Con11",&waveGenFMCon1[0])) {
@ -808,6 +816,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("3");
ImGui::TableNextColumn();
if (ImGui::Checkbox("##Con21",&waveGenFMCon2[0])) {
@ -832,6 +841,7 @@ void FurnaceGUI::drawWaveEdit() {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("4");
ImGui::TableNextColumn();
if (ImGui::Checkbox("##Con31",&waveGenFMCon3[0])) {