|
@@ -10065,17 +10065,11 @@ const ImGuiPayload* ImGui::AcceptDragDropPayload(const char* type, ImGuiDragDrop
|
|
}
|
|
}
|
|
|
|
|
|
// Render default drop visuals
|
|
// Render default drop visuals
|
|
|
|
+ // FIXME-DRAGDROP: Settle on a proper default visuals for drop target.
|
|
payload.Preview = was_accepted_previously;
|
|
payload.Preview = was_accepted_previously;
|
|
flags |= (g.DragDropSourceFlags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect); // Source can also inhibit the preview (useful for external sources that lives for 1 frame)
|
|
flags |= (g.DragDropSourceFlags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect); // Source can also inhibit the preview (useful for external sources that lives for 1 frame)
|
|
if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && payload.Preview)
|
|
if (!(flags & ImGuiDragDropFlags_AcceptNoDrawDefaultRect) && payload.Preview)
|
|
- {
|
|
|
|
- // FIXME-DRAGDROP: Settle on a proper default visuals for drop target.
|
|
|
|
- r.Expand(3.5f);
|
|
|
|
- bool push_clip_rect = !window->ClipRect.Contains(r);
|
|
|
|
- if (push_clip_rect) window->DrawList->PushClipRect(r.Min - ImVec2(1, 1), r.Max + ImVec2(1, 1));
|
|
|
|
- window->DrawList->AddRect(r.Min, r.Max, GetColorU32(ImGuiCol_DragDropTarget), 0.0f, 0, 2.0f);
|
|
|
|
- if (push_clip_rect) window->DrawList->PopClipRect();
|
|
|
|
- }
|
|
|
|
|
|
+ window->DrawList->AddRect(r.Min - ImVec2(3.5f,3.5f), r.Max + ImVec2(3.5f, 3.5f), GetColorU32(ImGuiCol_DragDropTarget), 0.0f, 0, 2.0f);
|
|
|
|
|
|
g.DragDropAcceptFrameCount = g.FrameCount;
|
|
g.DragDropAcceptFrameCount = g.FrameCount;
|
|
payload.Delivery = was_accepted_previously && !IsMouseDown(g.DragDropMouseButton); // For extern drag sources affecting os window focus, it's easier to just test !IsMouseDown() instead of IsMouseReleased()
|
|
payload.Delivery = was_accepted_previously && !IsMouseDown(g.DragDropMouseButton); // For extern drag sources affecting os window focus, it's easier to just test !IsMouseDown() instead of IsMouseReleased()
|