From 3920b1c764ef0f9d336eb4f2f8a62fb78a3453ad Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 12 Oct 2022 23:35:53 +0200 Subject: [PATCH] Removed commented out old flags from when Tables was a branch. ImGuiTableFlags_ColumnsWidthFixed, ImGuiTableFlags_ColumnsWidthStretch, ImGuiTableFlags_SizingPolicyFixed, ImGuiTableFlags_SizingPolicyStretch ImGuiTableColumnFlags_WidthAuto --- imgui.h | 11 ----------- imgui_draw.cpp | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/imgui.h b/imgui.h index 7af79200..5d8b7c52 100644 --- a/imgui.h +++ b/imgui.h @@ -1186,12 +1186,6 @@ enum ImGuiTableFlags_ // [Internal] Combinations and masks ImGuiTableFlags_SizingMask_ = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_SizingFixedSame | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_SizingStretchSame, - - // Obsolete names (will be removed soon) -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - //, ImGuiTableFlags_ColumnsWidthFixed = ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_ColumnsWidthStretch = ImGuiTableFlags_SizingStretchSame // WIP Tables 2020/12 - //, ImGuiTableFlags_SizingPolicyFixed = ImGuiTableFlags_SizingFixedFit, ImGuiTableFlags_SizingPolicyStretch = ImGuiTableFlags_SizingStretchSame // WIP Tables 2021/01 -#endif }; // Flags for ImGui::TableSetupColumn() @@ -1229,11 +1223,6 @@ enum ImGuiTableColumnFlags_ ImGuiTableColumnFlags_IndentMask_ = ImGuiTableColumnFlags_IndentEnable | ImGuiTableColumnFlags_IndentDisable, ImGuiTableColumnFlags_StatusMask_ = ImGuiTableColumnFlags_IsEnabled | ImGuiTableColumnFlags_IsVisible | ImGuiTableColumnFlags_IsSorted | ImGuiTableColumnFlags_IsHovered, ImGuiTableColumnFlags_NoDirectResize_ = 1 << 30, // [Internal] Disable user resizing this column directly (it may however we resized indirectly from its left edge) - - // Obsolete names (will be removed soon) -#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS - //ImGuiTableColumnFlags_WidthAuto = ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoResize, // Column will not stretch and keep resizing based on submitted contents. -#endif }; // Flags for ImGui::TableNextRow() diff --git a/imgui_draw.cpp b/imgui_draw.cpp index a0b94974..7a8f229e 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1312,6 +1312,7 @@ IM_STATIC_ASSERT(ImDrawFlags_RoundCornersTopLeft == (1 << 4)); static inline ImDrawFlags FixRectCornerFlags(ImDrawFlags flags) { #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS + // Obsoleted in 1.82 (from February 2021) // Legacy Support for hard coded ~0 (used to be a suggested equivalent to ImDrawCornerFlags_All) // ~0 --> ImDrawFlags_RoundCornersAll or 0 if (flags == ~0)