Skip to content

Commit 031a855

Browse files
authored
Update imgui to v1.92.0 (#7497)
* Update imgui to v1.92.0 * Add patch to fix shared build * Update comment
1 parent 31b877c commit 031a855

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/imgui.h b/imgui.h
2+
index 78baa1b7bb10..6b7dd2b64b5c 100644
3+
--- a/imgui.h
4+
+++ b/imgui.h
5+
@@ -3329,8 +3329,8 @@ struct ImDrawList
6+
7+
// Obsolete names
8+
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
9+
- IMGUI_API void PushTextureID(ImTextureRef tex_ref) { PushTexture(tex_ref); } // RENAMED in 1.92.x
10+
- IMGUI_API void PopTextureID() { PopTexture(); } // RENAMED in 1.92.x
11+
+ inline void PushTextureID(ImTextureRef tex_ref) { PushTexture(tex_ref); } // RENAMED in 1.92.x
12+
+ inline void PopTextureID() { PopTexture(); } // RENAMED in 1.92.x
13+
#endif
14+
//inline void AddEllipse(const ImVec2& center, float radius_x, float radius_y, ImU32 col, float rot = 0.0f, int num_segments = 0, float thickness = 1.0f) { AddEllipse(center, ImVec2(radius_x, radius_y), col, rot, num_segments, thickness); } // OBSOLETED in 1.90.5 (Mar 2024)
15+
//inline void AddEllipseFilled(const ImVec2& center, float radius_x, float radius_y, ImU32 col, float rot = 0.0f, int num_segments = 0) { AddEllipseFilled(center, ImVec2(radius_x, radius_y), col, rot, num_segments); } // OBSOLETED in 1.90.5 (Mar 2024)

packages/i/imgui/xmake.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package("imgui")
77
add_urls("https://github.com/ocornut/imgui.git", {alias = "git"})
88

99
-- don't forget to add the docking versions as well
10+
add_versions("v1.92.0", "42250c45df2736bcef867ae4ff404d138e5135cd36466c63143b1ea3b1c81091")
1011
add_versions("v1.91.9", "3872a5f90df78fced023c1945f4466b654fd74573370b77b17742149763a7a7c")
1112
add_versions("v1.91.8", "db3a2e02bfd6c269adf0968950573053d002f40bdfb9ef2e4a90bce804b0f286")
1213
add_versions("v1.91.7", "2001dab4bdd7d178d8277d3b17c40aa1ff1e76e2ccac5e7ab8c6daf9756312c2")
@@ -51,6 +52,7 @@ package("imgui")
5152
add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc")
5253
add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866")
5354

55+
add_versions("git:v1.92.0-docking", "v1.92.0-docking")
5456
add_versions("git:v1.91.9-docking", "v1.91.9-docking")
5557
add_versions("git:v1.91.8-docking", "v1.91.8-docking")
5658
add_versions("git:v1.91.7-docking", "v1.91.7-docking")
@@ -84,6 +86,10 @@ package("imgui")
8486
add_versions("git:v1.85-docking", "dc8c3618e8f8e2dada23daa1aa237626af341fd8")
8587
add_versions("git:v1.83-docking", "80b5fb51edba2fd3dea76ec3e88153e2492243d1")
8688

89+
-- Fix conflicting IMGUI_API definitions in v1.92.0 only (https://github.com/ocornut/imgui/pull/8729)
90+
add_patches("v1.92.0", "patches/v1.92.0/fix_imgui_api.patch", "e8ca0502056acf356f83703e7190dda87fde43ed245f65f0fb55b85cd164ed83")
91+
add_patches("v1.92.0-docking", "patches/v1.92.0/fix_imgui_api.patch", "e8ca0502056acf356f83703e7190dda87fde43ed245f65f0fb55b85cd164ed83")
92+
8793
add_configs("dx9", {description = "Enable the dx9 backend", default = false, type = "boolean"})
8894
add_configs("dx10", {description = "Enable the dx10 backend", default = false, type = "boolean"})
8995
add_configs("dx11", {description = "Enable the dx11 backend", default = false, type = "boolean"})

0 commit comments

Comments
 (0)