mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-13 13:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source
This commit is contained in:
ocornut
2025-09-18 15:39:05 +02:00
parent 03f3c8d385 0e7cd694eb
commit 8ccff82153
8 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docs/CHANGELOG.txt
View File

@@ -35,6 +35,21 @@ HOW TO UPDATE?
and API updates have been a little more frequent lately. They are documented below and in imgui.cpp and should not affect all users. and API updates have been a little more frequent lately. They are documented below and in imgui.cpp and should not affect all users.
- Please report any issue! - Please report any issue!
-----------------------------------------------------------------------
VERSION 1.92.4 WIP (In Progress)
-----------------------------------------------------------------------
Breaking Changes:
Other Changes:
Docking+Viewports Branch:
- Nav: fixed a crash that could occur when opening a popup following the processing
of a global shortcut while no windows were focused (the fix done in 1.92.3 was
incomplete for docking branch).
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.92.3 (Released 2025-09-17) VERSION 1.92.3 (Released 2025-09-17)
----------------------------------------------------------------------- -----------------------------------------------------------------------

2
imgui.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (main code and documentation) // (main code and documentation)
// Help: // Help:

6
imgui.h
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (headers) // (headers)
// Help: // Help:
@@ -28,8 +28,8 @@
// Library Version // Library Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345') // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
#define IMGUI_VERSION "1.92.3" #define IMGUI_VERSION "1.92.4 WIP"
#define IMGUI_VERSION_NUM 19230 #define IMGUI_VERSION_NUM 19231
#define IMGUI_HAS_TABLE // Added BeginTable() - from IMGUI_VERSION_NUM >= 18000 #define IMGUI_HAS_TABLE // Added BeginTable() - from IMGUI_VERSION_NUM >= 18000
#define IMGUI_HAS_TEXTURES // Added ImGuiBackendFlags_RendererHasTextures - from IMGUI_VERSION_NUM >= 19198 #define IMGUI_HAS_TEXTURES // Added ImGuiBackendFlags_RendererHasTextures - from IMGUI_VERSION_NUM >= 19198
#define IMGUI_HAS_VIEWPORT // In 'docking' WIP branch. #define IMGUI_HAS_VIEWPORT // In 'docking' WIP branch.

2
imgui_demo.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (demo code) // (demo code)
// Help: // Help:

2
imgui_draw.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (drawing and font code) // (drawing and font code)
/* /*

2
imgui_internal.h
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (internal structures/api) // (internal structures/api)
// You may use this file to debug, understand or extend Dear ImGui features but we don't provide any guarantee of forward compatibility. // You may use this file to debug, understand or extend Dear ImGui features but we don't provide any guarantee of forward compatibility.

2
imgui_tables.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (tables and columns code) // (tables and columns code)
/* /*

2
imgui_widgets.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.3 // dear imgui, v1.92.4 WIP
// (widgets code) // (widgets code)
/* /*