mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-14 17:07:01 +00:00
Internal: Disable debug logs macro if IMGUI_DISABLE_DEBUG_TOOLS is defined. (#5901)
+ needed to rework clipper code to avoid "The 'then' statement is equivalent to the 'else' statement." PVS Studio warning.
This commit is contained in:
parent
bd96f6eac4
commit
969af7c773
@ -39,8 +39,10 @@ Breaking changes:
|
||||
|
||||
Other changes:
|
||||
|
||||
- Text: Fixed layouting of wrapped-text block when the last source line is above the
|
||||
clipping region. Regression added in 1.89. (#5720, #5919)
|
||||
- Text: fixed layouting of wrapped-text block when the last source line is above the
|
||||
clipping region. Regression added in 1.89. (#5720, #5919)
|
||||
- Misc: fixed parameters to IMGUI_DEBUG_LOG() not being dead-stripped when building
|
||||
with IMGUI_DISABLE_DEBUG_TOOLS is used. (#5901) [@Teselka]
|
||||
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
|
@ -2871,11 +2871,14 @@ bool ImGuiListClipper::Step()
|
||||
if (need_items_height && ItemsHeight > 0.0f)
|
||||
IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): computed ItemsHeight: %.2f.\n", ItemsHeight);
|
||||
if (ret)
|
||||
{
|
||||
IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): display %d to %d.\n", DisplayStart, DisplayEnd);
|
||||
}
|
||||
else
|
||||
{
|
||||
IMGUI_DEBUG_LOG_CLIPPER("Clipper: Step(): End.\n");
|
||||
if (!ret)
|
||||
End();
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -211,7 +211,11 @@ namespace ImStb
|
||||
#endif
|
||||
|
||||
// Debug Logging for ShowDebugLogWindow(). This is designed for relatively rare events so please don't spam.
|
||||
#ifndef IMGUI_DISABLE_DEBUG_TOOLS
|
||||
#define IMGUI_DEBUG_LOG(...) ImGui::DebugLog(__VA_ARGS__)
|
||||
#else
|
||||
#define IMGUI_DEBUG_LOG(...) ((void)0)
|
||||
#endif
|
||||
#define IMGUI_DEBUG_LOG_ACTIVEID(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventActiveId) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)
|
||||
#define IMGUI_DEBUG_LOG_FOCUS(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventFocus) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)
|
||||
#define IMGUI_DEBUG_LOG_POPUP(...) do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)
|
||||
|
Loading…
Reference in New Issue
Block a user