From 2fc050c6b47d9520218c7e04bcb6af963eaf633d Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 10 Aug 2025 04:53:08 -0500 Subject: [PATCH] GUI: use ImGuiChildFlags_Border --- src/gui/commandPalette.cpp | 2 +- src/gui/debugWindow.cpp | 2 +- src/gui/gui.cpp | 2 +- src/gui/insEdit.cpp | 4 ++-- src/gui/mixer.cpp | 2 +- src/gui/newSong.cpp | 2 +- src/gui/settings.cpp | 4 ++-- src/gui/sysPicker.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gui/commandPalette.cpp b/src/gui/commandPalette.cpp index 3855f2216..f0586fe5f 100644 --- a/src/gui/commandPalette.cpp +++ b/src/gui/commandPalette.cpp @@ -249,7 +249,7 @@ void FurnaceGUI::drawPalette() { ImVec2 avail=ImGui::GetContentRegionAvail(); avail.y-=ImGui::GetFrameHeightWithSpacing(); - if (ImGui::BeginChild("CommandPaletteList",avail,false,0)) { + if (ImGui::BeginChild("CommandPaletteList",avail,0,0)) { bool navigated=false; if (ImGui::IsKeyPressed(ImGuiKey_UpArrow) && curPaletteChoice>0) { curPaletteChoice-=1; diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp index d08b89370..1144a0d87 100644 --- a/src/gui/debugWindow.cpp +++ b/src/gui/debugWindow.cpp @@ -761,7 +761,7 @@ void FurnaceGUI::drawDebug() { auto DrawSpot=[&](const CursorJumpPoint& spot) { ImGui::Text("[%d:%d] <%d:%d, %d>", spot.subSong, spot.order, spot.point.xCoarse, spot.point.xFine, spot.point.y); }; - if (ImGui::BeginChild("##CursorUndoDebugChild", ImVec2(0, 300), true)) { + if (ImGui::BeginChild("##CursorUndoDebugChild", ImVec2(0, 300), ImGuiChildFlags_Border)) { if (ImGui::BeginTable("##CursorUndoDebug", 2, ImGuiTableFlags_Borders|ImGuiTableFlags_SizingStretchSame)) { for (size_t row=0; rowlogLock.lock(); ImGui::PushFont(patFont); for (String& i: pendingExport->exportLog) { diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp index 4c761fc8b..5a0f5263d 100644 --- a/src/gui/insEdit.cpp +++ b/src/gui/insEdit.cpp @@ -7002,7 +7002,7 @@ void FurnaceGUI::drawInsEdit() { ImGui::EndTable(); } - if (ImGui::BeginChild("HWSeq",ImGui::GetContentRegionAvail(),true,ImGuiWindowFlags_MenuBar)) { + if (ImGui::BeginChild("HWSeq",ImGui::GetContentRegionAvail(),ImGuiChildFlags_Border,ImGuiWindowFlags_MenuBar)) { ImGui::BeginMenuBar(); ImGui::Text(_("Hardware Sequence")); ImGui::EndMenuBar(); @@ -7340,7 +7340,7 @@ void FurnaceGUI::drawInsEdit() { } if (ins->type==DIV_INS_SU) if (ImGui::BeginTabItem("Sound Unit")) { P(ImGui::Checkbox(_("Switch roles of frequency and phase reset timer"),&ins->su.switchRoles)); - if (ImGui::BeginChild("HWSeqSU",ImGui::GetContentRegionAvail(),true,ImGuiWindowFlags_MenuBar)) { + if (ImGui::BeginChild("HWSeqSU",ImGui::GetContentRegionAvail(),ImGuiChildFlags_Border,ImGuiWindowFlags_MenuBar)) { ImGui::BeginMenuBar(); ImGui::Text(_("Hardware Sequence")); ImGui::EndMenuBar(); diff --git a/src/gui/mixer.cpp b/src/gui/mixer.cpp index 7d85697af..119d67a1c 100644 --- a/src/gui/mixer.cpp +++ b/src/gui/mixer.cpp @@ -316,7 +316,7 @@ void FurnaceGUI::drawMixer() { hoveredPortSet=0x1fff; hoveredSubPort=-1; - if (ImGui::BeginChild("Patchbay",ImVec2(0,0),true)) { + if (ImGui::BeginChild("Patchbay",ImVec2(0,0),ImGuiChildFlags_Border)) { ImDrawList* dl=ImGui::GetWindowDrawList(); ImVec2 topPos=ImGui::GetCursorPos(); ImVec2 sysSize=calcPortSetSize(_("System"),displayHiddenPorts?DIV_MAX_OUTPUTS:e->getAudioDescGot().outChans,0); diff --git a/src/gui/newSong.cpp b/src/gui/newSong.cpp index 385ae998b..7034f8a01 100644 --- a/src/gui/newSong.cpp +++ b/src/gui/newSong.cpp @@ -130,7 +130,7 @@ void FurnaceGUI::drawNewSong() { ImVec2 avail=ImGui::GetContentRegionAvail(); avail.y-=ImGui::GetFrameHeightWithSpacing(); - if (ImGui::BeginChild("sysPickerC",avail,false,ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) { + if (ImGui::BeginChild("sysPickerC",avail,0,ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) { if (newSongFirstFrame) ImGui::SetKeyboardFocusHere(); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 56411d7f5..188bb0f68 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -334,7 +334,7 @@ const char* specificControls[18]={ bool _subInit=false; \ ImVec2 settingsViewSize=ImGui::GetContentRegionAvail(); \ settingsViewSize.y-=ImGui::GetFrameHeight()+ImGui::GetStyle().WindowPadding.y; \ - if (ImGui::BeginChild("SettingsView",settingsViewSize,false)) + if (ImGui::BeginChild("SettingsView",settingsViewSize,0)) #define END_SECTION } \ ImGui::EndChild(); \ @@ -2175,7 +2175,7 @@ void FurnaceGUI::drawSettings() { if (ImGui::Button(_("Reset defaults"))) { showWarning(_("Are you sure you want to reset the keyboard settings?"),GUI_WARN_RESET_KEYBINDS); } - if (ImGui::BeginChild("##HotkeysList",ImVec2(0,0),false,ImGuiWindowFlags_HorizontalScrollbar)) { + if (ImGui::BeginChild("##HotkeysList",ImVec2(0,0),0,ImGuiWindowFlags_HorizontalScrollbar)) { if (ImGui::TreeNode(_("Global hotkeys"))) { KEYBIND_CONFIG_BEGIN("keysGlobal"); diff --git a/src/gui/sysPicker.cpp b/src/gui/sysPicker.cpp index f07e9ac96..2c55ab0f3 100644 --- a/src/gui/sysPicker.cpp +++ b/src/gui/sysPicker.cpp @@ -87,7 +87,7 @@ DivSystem FurnaceGUI::systemPicker(bool fullWidth) { } ImGui::EndTable(); } - if (ImGui::BeginChild("SysDesc",ImVec2(0.0f,150.0f*dpiScale),false,ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoScrollWithMouse)) { + if (ImGui::BeginChild("SysDesc",ImVec2(0.0f,150.0f*dpiScale),0,ImGuiWindowFlags_NoScrollbar|ImGuiWindowFlags_NoScrollWithMouse)) { if (hoveredSys!=DIV_SYSTEM_NULL) { const DivSysDef* sysDef=e->getSystemDef(hoveredSys); ImGui::TextWrapped("%s",sysDef->description);