From f66dd6e70b39b0953e749097978b7cc1429efa30 Mon Sep 17 00:00:00 2001 From: Electric Keet Date: Sun, 6 Aug 2023 20:28:11 -0700 Subject: [PATCH 1/4] Vertical centering of labels. Just the settings dialog, this commit. --- src/gui/settings.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 412dd2a94..a0716d162 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -239,6 +239,7 @@ const char* specificControls[18]={ #define UI_KEYBIND_CONFIG(what) \ ImGui::TableNextRow(); \ ImGui::TableNextColumn(); \ + ImGui::AlignTextToFramePadding();\ ImGui::TextUnformatted(guiActions[what].friendlyName); \ ImGui::TableNextColumn(); \ if (ImGui::Button(fmt::sprintf("%s##KC_" #what,(bindSetPending && bindSetTarget==what)?"Press key...":getKeyName(actionKeys[what])).c_str())) { \ @@ -474,6 +475,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION CHIP CONFIG_SUBSECTION("Chip"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Initial system:"); ImGui::SameLine(); if (ImGui::Button("Current system")) { @@ -552,6 +554,7 @@ void FurnaceGUI::drawSettings() { settings.initialSysName="Sega Genesis/Mega Drive"; } + ImGui::AlignTextToFramePadding(); ImGui::Text("Name"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); @@ -720,6 +723,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION OUTPUT CONFIG_SUBSECTION("Output"); #ifdef HAVE_JACK + ImGui::AlignTextToFramePadding(); ImGui::Text("Backend"); ImGui::SameLine(); int prevAudioEngine=settings.audioEngine; @@ -731,6 +735,7 @@ void FurnaceGUI::drawSettings() { #endif if (settings.audioEngine==DIV_AUDIO_SDL) { + ImGui::AlignTextToFramePadding(); ImGui::Text("Driver"); ImGui::SameLine(); if (ImGui::BeginCombo("##SDLADriver",settings.sdlAudioDriver.empty()?"Automatic":settings.sdlAudioDriver.c_str())) { @@ -749,6 +754,7 @@ void FurnaceGUI::drawSettings() { } } + ImGui::AlignTextToFramePadding(); ImGui::Text("Device"); ImGui::SameLine(); String audioDevName=settings.audioDevice.empty()?"":settings.audioDevice; @@ -764,6 +770,7 @@ void FurnaceGUI::drawSettings() { ImGui::EndCombo(); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Sample rate"); ImGui::SameLine(); String sr=fmt::sprintf("%d",settings.audioRate); @@ -788,6 +795,7 @@ void FurnaceGUI::drawSettings() { if (settings.audioChans>16) settings.audioChans=16; } } else { + ImGui::AlignTextToFramePadding(); ImGui::Text("Channels"); ImGui::SameLine(); String chStr=(settings.audioChans<1 || settings.audioChans>8)?"What?":nonProAudioOuts[settings.audioChans-1]; @@ -801,6 +809,7 @@ void FurnaceGUI::drawSettings() { } } + ImGui::AlignTextToFramePadding(); ImGui::Text("Buffer size"); ImGui::SameLine(); String bs=fmt::sprintf("%d (latency: ~%.1fms)",settings.audioBufSize,2000.0*(double)settings.audioBufSize/(double)MAX(1,settings.audioRate)); @@ -835,6 +844,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION MIXING CONFIG_SUBSECTION("Mixing"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Quality"); ImGui::SameLine(); ImGui::Combo("##Quality",&settings.audioQuality,audioQualities,2); @@ -846,6 +856,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION METRONOME CONFIG_SUBSECTION("Metronome"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Metronome volume"); ImGui::SameLine(); if (ImGui::SliderInt("##MetroVol",&settings.metroVol,0,200,"%d%%")) { @@ -859,6 +870,7 @@ void FurnaceGUI::drawSettings() { CONFIG_SECTION("MIDI") { // SUBSECTION MIDI INPUT CONFIG_SUBSECTION("MIDI input"); + ImGui::AlignTextToFramePadding(); ImGui::Text("MIDI input"); ImGui::SameLine(); String midiInName=settings.midiInDevice.empty()?"":settings.midiInDevice; @@ -947,6 +959,7 @@ void FurnaceGUI::drawSettings() { } ImGui::PlotLines("##VolCurveDisplay",curve,128,0,"Volume curve",0.0,127.0,ImVec2(200.0f*dpiScale,200.0f*dpiScale)); + ImGui::AlignTextToFramePadding(); ImGui::Text("Actions:"); ImGui::SameLine(); if (ImGui::Button(ICON_FA_PLUS "##AddAction")) { @@ -1109,6 +1122,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION MIDI OUTPUT CONFIG_SUBSECTION("MIDI output"); + ImGui::AlignTextToFramePadding(); ImGui::Text("MIDI output"); ImGui::SameLine(); String midiOutName=settings.midiOutDevice.empty()?"":settings.midiOutDevice; @@ -1179,40 +1193,49 @@ void FurnaceGUI::drawSettings() { CONFIG_SECTION("Emulation") { // SUBSECTION LAYOUT CONFIG_SUBSECTION("Cores"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Arcade/YM2151 core"); ImGui::SameLine(); ImGui::Combo("##ArcadeCore",&settings.arcadeCore,arcadeCores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("Genesis/YM2612 core"); ImGui::SameLine(); ImGui::Combo("##YM2612Core",&settings.ym2612Core,ym2612Cores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("SN76489 core"); ImGui::SameLine(); ImGui::Combo("##SNCore",&settings.snCore,snCores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("NES core"); ImGui::SameLine(); ImGui::Combo("##NESCore",&settings.nesCore,nesCores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("FDS core"); ImGui::SameLine(); ImGui::Combo("##FDSCore",&settings.fdsCore,nesCores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("SID core"); ImGui::SameLine(); ImGui::Combo("##C64Core",&settings.c64Core,c64Cores,3); + ImGui::AlignTextToFramePadding(); ImGui::Text("POKEY core"); ImGui::SameLine(); ImGui::Combo("##POKEYCore",&settings.pokeyCore,pokeyCores,2); + ImGui::AlignTextToFramePadding(); ImGui::Text("OPN/OPNA/OPNB cores"); ImGui::SameLine(); ImGui::Combo("##OPNCore",&settings.opnCore,opnCores,2); ImGui::Separator(); + ImGui::AlignTextToFramePadding(); ImGui::Text("PC Speaker strategy"); ImGui::SameLine(); ImGui::Combo("##PCSOutMethod",&settings.pcSpeakerOutMethod,pcspkrOutMethods,5); @@ -1220,6 +1243,7 @@ void FurnaceGUI::drawSettings() { ImGui::Separator(); ImGui::Text("Sample ROMs:"); + ImGui::AlignTextToFramePadding(); ImGui::Text("OPL4 YRW801 path"); ImGui::SameLine(); ImGui::InputText("##YRW801Path",&settings.yrw801Path); @@ -1228,6 +1252,7 @@ void FurnaceGUI::drawSettings() { openFileDialog(GUI_FILE_YRW801_ROM_OPEN); } + ImGui::AlignTextToFramePadding(); ImGui::Text("MultiPCM TG100 path"); ImGui::SameLine(); ImGui::InputText("##TG100Path",&settings.tg100Path); @@ -1236,6 +1261,7 @@ void FurnaceGUI::drawSettings() { openFileDialog(GUI_FILE_TG100_ROM_OPEN); } + ImGui::AlignTextToFramePadding(); ImGui::Text("MultiPCM MU5 path"); ImGui::SameLine(); ImGui::InputText("##MU5Path",&settings.mu5Path); @@ -1605,6 +1631,7 @@ void FurnaceGUI::drawSettings() { CONFIG_SECTION("Interface") { // SUBSECTION LAYOUT CONFIG_SUBSECTION("Layout"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Workspace layout:"); ImGui::SameLine(); if (ImGui::Button("Import")) { @@ -1909,6 +1936,7 @@ void FurnaceGUI::drawSettings() { // SUBSECTION TEXT CONFIG_SUBSECTION("Text"); + ImGui::AlignTextToFramePadding(); ImGui::Text("Main font"); ImGui::SameLine(); ImGui::Combo("##MainFont",&settings.mainFont,mainFonts,7); @@ -1925,6 +1953,7 @@ void FurnaceGUI::drawSettings() { if (settings.mainFontSize>96) settings.mainFontSize=96; } ImGui::Unindent(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Header font"); ImGui::SameLine(); ImGui::Combo("##HeadFont",&settings.headFont,headFonts,7); @@ -1941,6 +1970,7 @@ void FurnaceGUI::drawSettings() { if (settings.headFontSize>96) settings.headFontSize=96; } ImGui::Unindent(); + ImGui::AlignTextToFramePadding(); ImGui::Text("Pattern font"); ImGui::SameLine(); ImGui::Combo("##PatFont",&settings.patFont,patFonts,7); From 1ea4452e9bd58786f8598bea2fa24ba59439db54 Mon Sep 17 00:00:00 2001 From: Electric Keet Date: Sun, 6 Aug 2023 20:51:51 -0700 Subject: [PATCH 2/4] 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)) { From 3effd9e5064adcc6ab37ae72e55c523648a631ce Mon Sep 17 00:00:00 2001 From: Electric Keet Date: Sun, 6 Aug 2023 22:47:17 -0700 Subject: [PATCH 3/4] Yet more vertical centering of labels. --- src/gui/insEdit.cpp | 4 ++++ src/gui/sampleEdit.cpp | 8 ++++++++ src/gui/songInfo.cpp | 5 +++++ src/gui/speed.cpp | 7 +++++++ src/gui/stats.cpp | 2 ++ src/gui/subSongs.cpp | 1 + src/gui/waveEdit.cpp | 10 ++++++++++ 7 files changed, 37 insertions(+) diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index e5f60d86b..1bfcf2848 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -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); diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp index 99ccbd22c..bd7529383 100644 --- a/src/gui/sampleEdit.cpp +++ b/src/gui/sampleEdit.cpp @@ -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)) { diff --git a/src/gui/songInfo.cpp b/src/gui/songInfo.cpp index 65803e577..b1c4895a0 100644 --- a/src/gui/songInfo.cpp +++ b/src/gui/songInfo.cpp @@ -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; diff --git a/src/gui/speed.cpp b/src/gui/speed.cpp index 5557c663e..593467852 100644 --- a/src/gui/speed.cpp +++ b/src/gui/speed.cpp @@ -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); diff --git a/src/gui/stats.cpp b/src/gui/stats.cpp index ed879ff2a..5bc2ee102 100644 --- a/src/gui/stats.cpp +++ b/src/gui/stats.cpp @@ -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()); diff --git a/src/gui/subSongs.cpp b/src/gui/subSongs.cpp index 5d34c23fd..15b107ed0 100644 --- a/src/gui/subSongs.cpp +++ b/src/gui/subSongs.cpp @@ -127,6 +127,7 @@ void FurnaceGUI::drawSubSongs(bool asChild) { ImGui::SetTooltip("Remove"); } + ImGui::AlignTextToFramePadding(); ImGui::Text("Name"); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); diff --git a/src/gui/waveEdit.cpp b/src/gui/waveEdit.cpp index dce89bc96..3905b7614 100644 --- a/src/gui/waveEdit.cpp +++ b/src/gui/waveEdit.cpp @@ -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])) { From 0a7d9571428969b8be8f726dcf206dde73245c20 Mon Sep 17 00:00:00 2001 From: Electric Keet Date: Mon, 7 Aug 2023 10:17:48 -0700 Subject: [PATCH 4/4] Last label tweak. --- src/gui/mixer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/mixer.cpp b/src/gui/mixer.cpp index ff1641ba0..dfa270ecd 100644 --- a/src/gui/mixer.cpp +++ b/src/gui/mixer.cpp @@ -244,6 +244,7 @@ void FurnaceGUI::drawMixer() { ImGui::TableNextRow(); ImGui::TableNextColumn(); + ImGui::AlignTextToFramePadding(); ImGui::Text("%d. %s",i+1,getSystemName(e->song.system[i])); ImGui::TableNextColumn(); if (ImGui::Checkbox("Invert",&doInvert)) {