mirror of
https://github.com/ocornut/imgui.git
synced 2024-12-18 16:58:53 +08:00
Drag and Drop: Drop target rectangle goes out of clipping range (#143)
This commit is contained in:
parent
b1653cd361
commit
4b94738c7e
10
imgui.cpp
10
imgui.cpp
@ -10818,9 +10818,13 @@ const ImGuiPayload* ImGui::AcceptDragDropPayload(const char* type, ImGuiDragDrop
|
|||||||
// Render drop visuals
|
// Render drop visuals
|
||||||
if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && was_accepted_previously)
|
if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && was_accepted_previously)
|
||||||
{
|
{
|
||||||
r.Expand(4.0f);
|
// FIXME-DRAG FIXME-STYLE: Settle on a proper default visuals for drop target, w/ ImGuiCol enum value probably.
|
||||||
window->DrawList->AddRectFilled(r.Min, r.Max, IM_COL32(255, 255, 0, 20), 0.0f); // FIXME-DRAG FIXME-STYLE
|
r.Expand(5.0f);
|
||||||
window->DrawList->AddRect(r.Min, r.Max, IM_COL32(255, 255, 0, 255), 0.0f, ~0, 2.0f); // FIXME-DRAG FIXME-STYLE
|
bool push_clip_rect = !window->ClipRect.Contains(r);
|
||||||
|
if (push_clip_rect) window->DrawList->PushClipRectFullScreen();
|
||||||
|
window->DrawList->AddRectFilled(r.Min, r.Max, IM_COL32(255, 255, 0, 20), 0.0f);
|
||||||
|
window->DrawList->AddRect(r.Min + ImVec2(1.5f,1.5f), r.Max - ImVec2(1.5f,1.5f), IM_COL32(255, 255, 0, 255), 0.0f, ~0, 2.0f);
|
||||||
|
if (push_clip_rect) window->DrawList->PopClipRect();
|
||||||
}
|
}
|
||||||
g.DragDropAcceptFrameCount = g.FrameCount;
|
g.DragDropAcceptFrameCount = g.FrameCount;
|
||||||
payload.Delivery = was_accepted_previously && IsMouseReleased(g.DragDropMouseButton);
|
payload.Delivery = was_accepted_previously && IsMouseReleased(g.DragDropMouseButton);
|
||||||
|
Loading…
Reference in New Issue
Block a user