From 1ea4452e9bd58786f8598bea2fa24ba59439db54 Mon Sep 17 00:00:00 2001 From: Electric Keet Date: Sun, 6 Aug 2023 20:51:51 -0700 Subject: [PATCH] More vertical centering of labels. chanOsc, debugWindow, editControls, findReplace, gui --- src/gui/chanOsc.cpp | 6 ++++++ src/gui/debugWindow.cpp | 1 + src/gui/editControls.cpp | 4 ++++ src/gui/findReplace.cpp | 5 +++++ src/gui/gui.cpp | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/src/gui/chanOsc.cpp b/src/gui/chanOsc.cpp index e4e9e85fb..aa7c91b5b 100644 --- a/src/gui/chanOsc.cpp +++ b/src/gui/chanOsc.cpp @@ -131,6 +131,7 @@ void FurnaceGUI::drawChanOsc() { if (ImGui::BeginTable("ChanOscSettings",3)) { ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Columns"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -154,6 +155,7 @@ void FurnaceGUI::drawChanOsc() { } ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Automatic columns"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -169,6 +171,7 @@ void FurnaceGUI::drawChanOsc() { ImGui::EndTable(); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Amplitude"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -261,6 +264,7 @@ void FurnaceGUI::drawChanOsc() { if (ImGui::ColorPicker4("Color",(float*)&i.color)) { updateChanOscGradTex=true; } + ImGui::AlignTextToFramePadding(); ImGui::Text("Distance"); ImGui::SameLine(); float pDist=i.distance*100.0f; @@ -269,6 +273,7 @@ void FurnaceGUI::drawChanOsc() { updateChanOscGradTex=true; } + ImGui::AlignTextToFramePadding(); ImGui::Text("Spread"); ImGui::SameLine(); float pSpread=i.spread*100.0f; @@ -313,6 +318,7 @@ void FurnaceGUI::drawChanOsc() { ImGui::ColorPicker4("Color",(float*)&chanOscColor); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Text format:"); ImGui::SameLine(); ImGui::InputText("##TextFormat",&chanOscTextFormat); diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp index bfeb9067e..9d59e44d2 100644 --- a/src/gui/debugWindow.cpp +++ b/src/gui/debugWindow.cpp @@ -486,6 +486,7 @@ void FurnaceGUI::drawDebug() { pgProgram.clear(); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Address"); ImGui::SameLine(); ImGui::SetNextItemWidth(100.0f*dpiScale); diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp index 099ff7e25..24aeb87cd 100644 --- a/src/gui/editControls.cpp +++ b/src/gui/editControls.cpp @@ -619,6 +619,7 @@ void FurnaceGUI::drawMobileControls() { "Furnace Amiga emulator is working properly by\n" "comparing it with real Amiga output." ); + ImGui::AlignTextToFramePadding(); ImGui::Text("Directory"); ImGui::SameLine(); ImGui::InputText("##AVDPath",&workingDirROMExport); @@ -717,6 +718,7 @@ void FurnaceGUI::drawEditControls() { e->setMetronome(metro); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Follow"); ImGui::SameLine(); unimportant(ImGui::Checkbox("Orders",&followOrders)); @@ -1063,6 +1065,7 @@ void FurnaceGUI::drawEditControls() { if (ImGui::Begin("Edit Controls",&editControlsOpen,globalWinFlags)) { ImGui::Columns(2); + ImGui::AlignTextToFramePadding(); ImGui::Text("Octave"); ImGui::SameLine(); float cursor=ImGui::GetCursorPosX(); @@ -1078,6 +1081,7 @@ void FurnaceGUI::drawEditControls() { } } + ImGui::AlignTextToFramePadding(); ImGui::Text("Step"); ImGui::SameLine(); ImGui::SetCursorPosX(cursor); diff --git a/src/gui/findReplace.cpp b/src/gui/findReplace.cpp index b6fcd14ce..60976d31c 100644 --- a/src/gui/findReplace.cpp +++ b/src/gui/findReplace.cpp @@ -595,6 +595,7 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthStretch,0.25); ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Note"); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -662,6 +663,7 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Ins"); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -697,6 +699,7 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Volume"); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -734,6 +737,7 @@ void FurnaceGUI::drawFindReplace() { ImGui::PushID(0x1000+j); ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Effect"); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -769,6 +773,7 @@ void FurnaceGUI::drawFindReplace() { ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Value"); ImGui::TableNextColumn(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 4e30823ba..cc0461653 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -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 down (-16)",BIND_FOR(GUI_ACTION_PAT_VALUE_DOWN_COARSE))) doTranspose(-16,opMaskTransposeValue); ImGui::Separator(); + ImGui::AlignTextToFramePadding(); ImGui::Text("transpose"); ImGui::SameLine(); ImGui::SetNextItemWidth(120.0f*dpiScale); @@ -4118,6 +4119,7 @@ bool FurnaceGUI::loop() { "Furnace Amiga emulator is working properly by\n" "comparing it with real Amiga output." ); + ImGui::AlignTextToFramePadding(); ImGui::Text("Directory"); ImGui::SameLine(); ImGui::InputText("##AVDPath",&workingDirROMExport); @@ -5643,6 +5645,7 @@ bool FurnaceGUI::loop() { if (pendingInsSingle) { ImGui::Text("this is an instrument bank! select which one to use:"); } else { + ImGui::AlignTextToFramePadding(); ImGui::Text("this is an instrument bank! select which ones to load:"); ImGui::SameLine(); if (ImGui::Button("All")) { @@ -5730,6 +5733,7 @@ bool FurnaceGUI::loop() { } ImGui::BeginDisabled(pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_8BIT && pendingRawSampleDepth!=DIV_SAMPLE_DEPTH_16BIT); + ImGui::AlignTextToFramePadding(); ImGui::Text("Channels"); ImGui::SameLine(); if (ImGui::InputInt("##RSChans",&pendingRawSampleChannels)) {