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

More vertical centering of labels.

Browse source 
chanOsc, debugWindow, editControls, findReplace, gui
This commit is contained in:
Electric Keet 2023-08-06 20:51:51 -07:00
parent f66dd6e70b
commit 1ea4452e9b
5 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/chanOsc.cpp
View file

@ -131,6 +131,7 @@ void FurnaceGUI::drawChanOsc() {
if (ImGui::BeginTable("ChanOscSettings",3)) { if (ImGui::BeginTable("ChanOscSettings",3)) {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Columns"); ImGui::Text("Columns");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -154,6 +155,7 @@ void FurnaceGUI::drawChanOsc() {
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Automatic columns"); ImGui::Text("Automatic columns");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -169,6 +171,7 @@ void FurnaceGUI::drawChanOsc() {
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Amplitude"); ImGui::Text("Amplitude");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -261,6 +264,7 @@ void FurnaceGUI::drawChanOsc() {
if (ImGui::ColorPicker4("Color",(float*)&i.color)) { if (ImGui::ColorPicker4("Color",(float*)&i.color)) {
updateChanOscGradTex=true; updateChanOscGradTex=true;
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Distance"); ImGui::Text("Distance");
ImGui::SameLine(); ImGui::SameLine();
float pDist=i.distance*100.0f; float pDist=i.distance*100.0f;
@ -269,6 +273,7 @@ void FurnaceGUI::drawChanOsc() {
updateChanOscGradTex=true; updateChanOscGradTex=true;
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Spread"); ImGui::Text("Spread");
ImGui::SameLine(); ImGui::SameLine();
float pSpread=i.spread*100.0f; float pSpread=i.spread*100.0f;
@ -313,6 +318,7 @@ void FurnaceGUI::drawChanOsc() {
ImGui::ColorPicker4("Color",(float*)&chanOscColor); ImGui::ColorPicker4("Color",(float*)&chanOscColor);
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Text format:"); ImGui::Text("Text format:");
ImGui::SameLine(); ImGui::SameLine();
ImGui::InputText("##TextFormat",&chanOscTextFormat); ImGui::InputText("##TextFormat",&chanOscTextFormat);

1
src/gui/debugWindow.cpp
View file

@ -486,6 +486,7 @@ void FurnaceGUI::drawDebug() {
pgProgram.clear(); pgProgram.clear();
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Address"); ImGui::Text("Address");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(100.0f*dpiScale); ImGui::SetNextItemWidth(100.0f*dpiScale);

4
src/gui/editControls.cpp
View file

@ -619,6 +619,7 @@ void FurnaceGUI::drawMobileControls() {
"Furnace Amiga emulator is working properly by\n" "Furnace Amiga emulator is working properly by\n"
"comparing it with real Amiga output." "comparing it with real Amiga output."
); );
ImGui::AlignTextToFramePadding();
ImGui::Text("Directory"); ImGui::Text("Directory");
ImGui::SameLine(); ImGui::SameLine();
ImGui::InputText("##AVDPath",&workingDirROMExport); ImGui::InputText("##AVDPath",&workingDirROMExport);
@ -717,6 +718,7 @@ void FurnaceGUI::drawEditControls() {
e->setMetronome(metro); e->setMetronome(metro);
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Follow"); ImGui::Text("Follow");
ImGui::SameLine(); ImGui::SameLine();
unimportant(ImGui::Checkbox("Orders",&followOrders)); unimportant(ImGui::Checkbox("Orders",&followOrders));
@ -1063,6 +1065,7 @@ void FurnaceGUI::drawEditControls() {
if (ImGui::Begin("Edit Controls",&editControlsOpen,globalWinFlags)) { if (ImGui::Begin("Edit Controls",&editControlsOpen,globalWinFlags)) {
ImGui::Columns(2); ImGui::Columns(2);
ImGui::AlignTextToFramePadding();
ImGui::Text("Octave"); ImGui::Text("Octave");
ImGui::SameLine(); ImGui::SameLine();
float cursor=ImGui::GetCursorPosX(); float cursor=ImGui::GetCursorPosX();
@ -1078,6 +1081,7 @@ void FurnaceGUI::drawEditControls() {
} }
} }
ImGui::AlignTextToFramePadding();
ImGui::Text("Step"); ImGui::Text("Step");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetCursorPosX(cursor); ImGui::SetCursorPosX(cursor);

5
src/gui/findReplace.cpp
View file

@ -595,6 +595,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthStretch,0.25); ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthStretch,0.25);
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Note"); ImGui::Text("Note");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -662,6 +663,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Ins"); ImGui::Text("Ins");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -697,6 +699,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Volume"); ImGui::Text("Volume");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -734,6 +737,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::PushID(0x1000+j); ImGui::PushID(0x1000+j);
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Effect"); ImGui::Text("Effect");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@ -769,6 +773,7 @@ void FurnaceGUI::drawFindReplace() {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::AlignTextToFramePadding();
ImGui::Text("Value"); ImGui::Text("Value");
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);

4
src/gui/gui.cpp
View file

@ -2783,6 +2783,7 @@ void FurnaceGUI::editOptions(bool topMenu) {
if (ImGui::MenuItem("values up (+16)",BIND_FOR(GUI_ACTION_PAT_VALUE_UP_COARSE))) doTranspose(16,opMaskTransposeValue); if (ImGui::MenuItem("values up (+16)",BIND_FOR(GUI_ACTION_PAT_VALUE_UP_COARSE))) doTranspose(16,opMaskTransposeValue);
if (ImGui::MenuItem("values down (-16)",BIND_FOR(GUI_ACTION_PAT_VALUE_DOWN_COARSE))) doTranspose(-16,opMaskTransposeValue); if (ImGui::MenuItem("values down (-16)",BIND_FOR(GUI_ACTION_PAT_VALUE_DOWN_COARSE))) doTranspose(-16,opMaskTransposeValue);
ImGui::Separator(); ImGui::Separator();
ImGui::AlignTextToFramePadding();
ImGui::Text("transpose"); ImGui::Text("transpose");
ImGui::SameLine(); ImGui::SameLine();
ImGui::SetNextItemWidth(120.0f*dpiScale); ImGui::SetNextItemWidth(120.0f*dpiScale);
@ -4118,6 +4119,7 @@ bool FurnaceGUI::loop() {
"Furnace Amiga emulator is working properly by\n" "Furnace Amiga emulator is working properly by\n"
"comparing it with real Amiga output." "comparing it with real Amiga output."
); );
ImGui::AlignTextToFramePadding();
ImGui::Text("Directory"); ImGui::Text("Directory");
ImGui::SameLine(); ImGui::SameLine();
ImGui::InputText("##AVDPath",&workingDirROMExport); ImGui::InputText("##AVDPath",&workingDirROMExport);
@ -5643,6 +5645,7 @@ bool FurnaceGUI::loop() {
if (pendingInsSingle) { if (pendingInsSingle) {
ImGui::Text("this is an instrument bank! select which one to use:"); ImGui::Text("this is an instrument bank! select which one to use:");
} else { } else {
ImGui::AlignTextToFramePadding();
ImGui::Text("this is an instrument bank! select which ones to load:"); ImGui::Text("this is an instrument bank! select which ones to load:");
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("All")) { if (ImGui::Button("All")) {
@ -5730,6 +5733,7 @@ bool FurnaceGUI::loop() {
} }
ImGui::BeginDisabled(pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_8BIT && pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_16BIT); ImGui::BeginDisabled(pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_8BIT && pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_16BIT);
ImGui::AlignTextToFramePadding();
ImGui::Text("Channels"); ImGui::Text("Channels");
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::InputInt("##RSChans",&pendingRawSampleChannels)) { if (ImGui::InputInt("##RSChans",&pendingRawSampleChannels)) {