Rename ImGuiItemFlags to ItemFlags

dextercd · Sep 17, 2024 · d1f7148 · d1f7148
1 parent 2f2f60f
commit d1f7148
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/imguidoc/imgui_definitions.lua b/imguidoc/imgui_definitions.lua
@@ -336,8 +336,8 @@ ImGui.StyleVar = {
 }
 
 
----@enum ImGuiItemFlags
-ImGui.ImGuiItemFlags = {
+---@enum ItemFlags
+ImGui.ItemFlags = {
     None = 0,
     NoTabStop = 1,
     NoNav = 2,

diff --git a/src/add_lua_features.cpp b/src/add_lua_features.cpp
@@ -26,7 +26,7 @@ void add_imgui_layout(sol::table&);
 void add_imgui_list_clipper(sol::table&);
 void add_imgui_menu(sol::table&);
 void add_imgui_mouse_input(sol::table&);
-void add_imgui_param_stacks(sol::table&);
+void add_imgui_param_stacks(sol::table&, version_number version);
 void add_imgui_popup(sol::table&);
 void add_imgui_regular_sliders(sol::table&);
 void add_imgui_scopes(sol::table&);
@@ -80,7 +80,7 @@ sol::table load_imgui(sol::this_state s, sol::table load_params)
     add_imgui_list_clipper(imgui);
     add_imgui_menu(imgui);
     add_imgui_mouse_input(imgui);
-    add_imgui_param_stacks(imgui);
+    add_imgui_param_stacks(imgui, version);
     add_imgui_popup(imgui);
     add_imgui_regular_sliders(imgui);
     add_imgui_scopes(imgui);

diff --git a/src/lua_features/imgui_param_stacks.cpp b/src/lua_features/imgui_param_stacks.cpp
@@ -1,7 +1,9 @@
 #include <sol/sol.hpp>
 #include <imgui.h>
 
-void add_imgui_param_stacks(sol::table& imgui)
+#include <noita_imgui/version_number.hpp>
+
+void add_imgui_param_stacks(sol::table& imgui, version_number version)
 {
     imgui.new_enum<ImGuiCol_>("Col", {
         {"Text",                      ImGuiCol_Text},
@@ -111,7 +113,7 @@ void add_imgui_param_stacks(sol::table& imgui)
         {"COUNT",                       ImGuiStyleVar_COUNT},
     });
 
-    imgui.new_enum<ImGuiItemFlags_>("ImGuiItemFlags", {
+    imgui.new_enum<ImGuiItemFlags_>("ItemFlags", {
         {"None",              ImGuiItemFlags_None},
         {"NoTabStop",         ImGuiItemFlags_NoTabStop},
         {"NoNav",             ImGuiItemFlags_NoNav},
@@ -120,6 +122,10 @@ void add_imgui_param_stacks(sol::table& imgui)
         {"AutoClosePopups",   ImGuiItemFlags_AutoClosePopups},
     });
 
+    // This had the wrong name for a while
+    if (version <= version_number{1, 24, 0, 0})
+        imgui["ImGuiItemFlags"] = imgui["ItemFlags"];
+
     imgui.set_function("PushStyleColor",
         sol::overload(
             [](ImGuiCol idx, float r, float g, float b) -> void { ImGui::PushStyleColor(idx, ImVec4{r, g, b, 1.0f}); },