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

update Dear ImGui to 1.92.5 - READ

Browse source 
there are some text changes which may break text undo/redo.
testing needed.
This commit is contained in:
tildearrow 2025-12-26 18:12:14 -05:00
parent 7cb0dacf9e
commit 34b06855cd
31 changed files with 1404 additions and 736 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/dataList.cpp
View file

@ -88,7 +88,7 @@ const char* sampleNote[12]={
int target=i; \
bool markModified=false; \
if (_toMoveVar!=target) { \
if (ImGui::IsKeyDown(ImGuiKey_ModCtrl)) { \
if (ImGui::IsKeyDown(ImGuiKey_LeftCtrl) || ImGui::IsKeyDown(ImGuiKey_RightCtrl)) { \
markModified=_swapFn(_toMoveVar,target); \
} else { \
while (_toMoveVar>target) { \

2
src/gui/debugWindow.cpp
View file

@ -851,7 +851,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), ImGuiChildFlags_Border)) {
if (ImGui::BeginChild("##CursorUndoDebugChild", ImVec2(0, 300), ImGuiChildFlags_Borders)) {
if (ImGui::BeginTable("##CursorUndoDebug", 2, ImGuiTableFlags_Borders|ImGuiTableFlags_SizingStretchSame)) {
for (size_t row=0; row<MAX(cursorUndoHist.size(),cursorRedoHist.size()); ++row) {
ImGui::TableNextRow();

2
src/gui/gui.cpp
View file

@ -6159,7 +6159,7 @@ bool FurnaceGUI::loop() {
ImVec2 romLogSize=ImGui::GetContentRegionAvail();
romLogSize.y-=ImGui::GetFrameHeightWithSpacing();
if (romLogSize.y<60.0f*dpiScale) romLogSize.y=60.0f*dpiScale;
if (ImGui::BeginChild("Export Log",romLogSize,ImGuiChildFlags_Border)) {
if (ImGui::BeginChild("Export Log",romLogSize,ImGuiChildFlags_Borders)) {
pendingExport->logLock.lock();
ImGui::PushFont(patFont);
for (String& i: pendingExport->exportLog) {

4
src/gui/insEdit.cpp
View file

@ -7036,7 +7036,7 @@ void FurnaceGUI::drawInsEdit() {
ImGui::EndTable();
}
if (ImGui::BeginChild("HWSeq",ImGui::GetContentRegionAvail(),ImGuiChildFlags_Border,ImGuiWindowFlags_MenuBar)) {
if (ImGui::BeginChild("HWSeq",ImGui::GetContentRegionAvail(),ImGuiChildFlags_Borders,ImGuiWindowFlags_MenuBar)) {
ImGui::BeginMenuBar();
ImGui::Text(_("Hardware Sequence"));
ImGui::EndMenuBar();
@ -7374,7 +7374,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(),ImGuiChildFlags_Border,ImGuiWindowFlags_MenuBar)) {
if (ImGui::BeginChild("HWSeqSU",ImGui::GetContentRegionAvail(),ImGuiChildFlags_Borders,ImGuiWindowFlags_MenuBar)) {
ImGui::BeginMenuBar();
ImGui::Text(_("Hardware Sequence"));
ImGui::EndMenuBar();

2
src/gui/mixer.cpp
View file

@ -329,7 +329,7 @@ void FurnaceGUI::drawMixer() {
hoveredPortSet=0x1fff;
hoveredSubPort=-1;
if (ImGui::BeginChild("Patchbay",ImVec2(0,0),ImGuiChildFlags_Border)) {
if (ImGui::BeginChild("Patchbay",ImVec2(0,0),ImGuiChildFlags_Borders)) {
ImDrawList* dl=ImGui::GetWindowDrawList();
ImVec2 topPos=ImGui::GetCursorPos();
ImVec2 sysSize=calcPortSetSize(_("System"),displayHiddenPorts?DIV_MAX_OUTPUTS:e->getAudioDescGot().outChans,0);

2
src/gui/sysManager.cpp
View file

@ -54,7 +54,7 @@ void FurnaceGUI::drawSysManager() {
const DivSysDef* sysDef=e->getSystemDef(e->song.system[i]);
ImGui::PushID(i);
if (ImGui::BeginChild(rackID.c_str(),ImVec2(0,0),ImGuiChildFlags_Border|ImGuiChildFlags_AutoResizeY)) {
if (ImGui::BeginChild(rackID.c_str(),ImVec2(0,0),ImGuiChildFlags_Borders|ImGuiChildFlags_AutoResizeY)) {
// swap handle and name
if (ImGui::Button(ICON_FA_ARROWS)) {
}