diff --git a/imgui.cpp b/imgui.cpp index b7f7b9575..67bd6dae1 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -399,7 +399,6 @@ IMPLEMENTING SUPPORT for ImGuiBackendFlags_RendererHasTextures: 2026/06/XX (1.XXXX) - merged ImDrawListFlags into ImDrawFlags. obsoleted ImDrawListFlags (which were rarely used directly): - ImDrawListFlags_AntiAliasedLines -> ImDrawFlags_AALines, - ImDrawListFlags_AntiAliasedFill -> ImDrawFlags_AAFill, - - ImDrawListFlags_AntiAliasedLinesUseTex -> ImDrawFlags_UseTexForStrokeLegacy - ImDrawListFlags_AllowVtxOffset -> ImDrawFlags_UseVtxOffset, - ImDrawListFlags_TextNoPixelSnap -> ImDrawFlags_TextNoPixelSnap, unifying them allows easily using them for both per-primitives alterations and scope alterations. @@ -5790,10 +5789,6 @@ static void SetupDrawListSharedData() g.DrawListSharedData.InitialDrawFlags |= ImDrawFlags_AALines; if (g.Style.AntiAliasedLineEnds) g.DrawListSharedData.InitialDrawFlags |= ImDrawFlags_AALineEnds; -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - if (g.Style.AntiAliasedLinesUseTex && !(g.IO.Fonts->Flags & ImFontAtlasFlags_NoBakedLines)) - g.DrawListSharedData.InitialDrawFlags |= ImDrawFlags_UseTexForStrokeLegacy; -#endif if (!(g.IO.Fonts->Flags & ImFontAtlasFlags_NoBakedRoundCorners)) g.DrawListSharedData.InitialDrawFlags |= ImDrawFlags_UseTexForRoundCorners | ImDrawFlags_AllowTexForRoundCorners_; if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset) diff --git a/imgui.h b/imgui.h index c42102d4e..a070e36d5 100644 --- a/imgui.h +++ b/imgui.h @@ -3476,13 +3476,12 @@ enum ImDrawFlags_ // Other Options ------------------------------ // Prim/Scope? ImDrawFlags_TextNoPixelSnap = 1 << 20, // OK OK(0) // Disable automatically snapping AddText() calls to pixel boundaries. ImDrawFlags_UseTexForRoundCorners = 1 << 21, // -- OK(1) // Enable using textures instead of strokes to draw rounded corners/circles where possible (faster). Used by default unless 'ImFontAtlasFlags_NoBakedRoundCorners' is enabled in the font atlas. - ImDrawFlags_UseTexForStrokeLegacy = 1 << 22, // -- OK(1) // Enable anti-aliased lines/borders using textures when using legacy strokes. Require backend to render with bilinear filtering (NOT point/nearest filtering). Used by default unless 'ImFontAtlasFlags_NoBakedLines' is set in the font atlas. - ImDrawFlags_UseVtxOffset = 1 << 23, // -- OK(1) // Can emit 'VtxOffset > 0' to allow large meshes with 16-bit ImDrawIdx. Used by default when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled by the backend. - ImDrawFlags_AllowTexForRoundCorners_= 1 << 24, // -- OK(1) // [Internal] + ImDrawFlags_UseVtxOffset = 1 << 22, // -- OK(1) // Can emit 'VtxOffset > 0' to allow large meshes with 16-bit ImDrawIdx. Used by default when 'ImGuiBackendFlags_RendererHasVtxOffset' is enabled by the backend. + ImDrawFlags_AllowTexForRoundCorners_= 1 << 23, // -- OK(1) // [Internal] // [Internal] ImDrawFlags_RoundCornersMask_ = ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone, // [Internal] - ImDrawFlags_AllowInPushScope_ = ImDrawFlags_AAFill | ImDrawFlags_AALines | ImDrawFlags_AALineEnds | ImDrawFlags_StrokeLegacy | ImDrawFlags_TextNoPixelSnap | ImDrawFlags_UseTexForRoundCorners | ImDrawFlags_UseTexForStrokeLegacy | ImDrawFlags_UseVtxOffset | ImDrawFlags_RoundCornersMask_, // [Internal] Values allowed in PushDrawFlag() scope. + ImDrawFlags_AllowInPushScope_ = ImDrawFlags_AAFill | ImDrawFlags_AALines | ImDrawFlags_AALineEnds | ImDrawFlags_StrokeLegacy | ImDrawFlags_TextNoPixelSnap | ImDrawFlags_UseTexForRoundCorners | ImDrawFlags_UseVtxOffset | ImDrawFlags_RoundCornersMask_, // [Internal] Values allowed in PushDrawFlag() scope. ImDrawFlags_AllowInFrameScope_ = ImDrawFlags_AllowInPushScope_ | ImDrawFlags_AllowTexForRoundCorners_, ImDrawFlags_StrokeMask_ = 0x07 << 17, // [Internal] ImDrawFlags_InvalidMask_ = ~0x7FFFFFF0, // [Internal] == 0x8000000F. Reserved to detect misuses. @@ -4549,7 +4548,6 @@ namespace ImGui #define ImDrawCallback_ResetRenderState (ImDrawCallback)(-8) // OBSOLETED in 1.92.8: Use ImGui::GetPlatformIO().DrawCallback_ResetRenderState - // -- RENAMED in 1.93.0: Merged ImDrawListFlags into ImDrawFlags. typedef ImDrawFlags ImDrawListFlags; enum ImDrawListFlags_ @@ -4557,7 +4555,7 @@ enum ImDrawListFlags_ ImDrawListFlags_None = ImDrawFlags_None, ImDrawListFlags_AntiAliasedFill = ImDrawFlags_AAFill, ImDrawListFlags_AntiAliasedLines = ImDrawFlags_AALines, - ImDrawListFlags_AntiAliasedLinesUseTex = ImDrawFlags_UseTexForStrokeLegacy,// Only apply to StrokeLegacy mode! + ImDrawListFlags_AntiAliasedLinesUseTex = 0, // Only apply to StrokeLegacy mode! ImDrawListFlags_AllowVtxOffset = ImDrawFlags_UseVtxOffset, ImDrawListFlags_TextNoPixelSnap = ImDrawFlags_TextNoPixelSnap, };