Skip to content

Commit

Permalink
update imgui (+ test_engine): Workaround cibuildwheel issue (can't us…
Browse files Browse the repository at this point in the history
…e string for IniFilename)

See #170
  • Loading branch information
pthom committed Jan 19, 2024
1 parent 9bb1036 commit 5b82177
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 21 deletions.
17 changes: 6 additions & 11 deletions bindings/imgui_bundle/imgui/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,12 @@ INDEX_SIZE: int
#
# #endif
#

# #ifdef IMGUI_BUNDLE_PYTHON_API
#
##define IMGUI_BUNDLE_IMGUI_USE_STRING
# #endif
#
# [/ADAPT_IMGUI_BUNDLE]

#
Expand Down Expand Up @@ -8003,17 +8009,6 @@ class IO:
# float IniSavingRate; /* original C++ signature */
ini_saving_rate: float
# = 5.0 // Minimum time between saving positions/sizes to .ini file, in seconds.
# #ifdef IMGUI_BUNDLE_PYTHON_API
#
# std::string LogFilename; /* original C++ signature */
log_filename: str # = "imgui_log.txt"// Path to .log file (default parameter to ImGui::LogToFile when no file is specified).
# std::string IniFilename; /* original C++ signature */
ini_filename: str
# = "imgui.ini" // Path to .ini file (important: default "imgui.ini" is relative to current working dir!). Set None to disable automatic .ini loading/saving or if you want to manually call LoadIniSettingsXXX() / SaveIniSettingsXXX() functions.
# #else
#
# #endif
#

# void* UserData; /* original C++ signature */
user_data: Any # = None // Store your own data.
Expand Down
12 changes: 4 additions & 8 deletions external/imgui/bindings/pybind_imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ void py_init_module_imgui_main(py::module& m)
//
// #endif
//
// #ifdef IMGUI_BUNDLE_PYTHON_API
//
// #endif
//
// #ifndef IMGUI_DISABLE
//
// #ifdef IMGUI_BUNDLE_PYTHON_API
Expand Down Expand Up @@ -5036,14 +5040,6 @@ void py_init_module_imgui_main(py::module& m)
.def_readwrite("display_size", &ImGuiIO::DisplaySize, "<unset> // Main display size, in pixels (generally == GetMainViewport()->Size). May change every frame.")
.def_readwrite("delta_time", &ImGuiIO::DeltaTime, "= 1.0/60.0 // Time elapsed since last frame, in seconds. May change every frame.")
.def_readwrite("ini_saving_rate", &ImGuiIO::IniSavingRate, "")
// #ifdef IMGUI_BUNDLE_PYTHON_API
//
.def_readwrite("log_filename", &ImGuiIO::LogFilename, "= \"imgui_log.txt\"// Path to .log file (default parameter to ImGui::LogToFile when no file is specified).")
.def_readwrite("ini_filename", &ImGuiIO::IniFilename, "")
// #else
//
// #endif
//
.def_readwrite("user_data", &ImGuiIO::UserData, "= None // Store your own data.")
.def_readwrite("fonts", &ImGuiIO::Fonts, "<auto> // Font atlas: load, rasterize and pack one or more fonts into a single texture.")
.def_readwrite("font_global_scale", &ImGuiIO::FontGlobalScale, "= 1.0 // Global scale all fonts")
Expand Down
2 changes: 1 addition & 1 deletion external/imgui/imgui
Submodule imgui updated 2 files
+5 −5 imgui.cpp
+6 −1 imgui.h
2 changes: 1 addition & 1 deletion external/imgui_test_engine/imgui_test_engine

0 comments on commit 5b82177

Please sign in to comment.