Merge branch 'master' into docking

This commit is contained in:
ocornut
2025-03-17 20:18:29 +01:00
8 changed files with 48 additions and 29 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.9
// dear imgui, v1.91b
// (widgets code)
/*
@@ -6214,7 +6214,7 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl
if (g.Style.FrameBorderSize > 0.0f)
RenderFrameBorder(bb.Min, bb.Max, rounding);
else
window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color button are often in need of some sort of border
window->DrawList->AddRect(bb.Min, bb.Max, GetColorU32(ImGuiCol_FrameBg), rounding); // Color buttons are often in need of some sort of border
}
// Drag and Drop Source