mirror of
https://github.com/ocornut/imgui.git
synced 2026-04-02 21:47:38 -05:00
Merge branch 'master' into docking
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user