Skip to content

Commit c2f740d

Browse files
committed
Update to Dear ImGui 1.92.4
1 parent 6bb6be2 commit c2f740d

45 files changed

Lines changed: 5175 additions & 4724 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cmake-backends.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ jobs:
123123
needs: [build-base, build-sdl2, build-sdl3, build-glfw]
124124
uses: JunaMeinhold/cmake-actions/.github/workflows/create-pr.yml@v1.x.x
125125
with:
126-
lib-name: "ImGuiImpl"
127-
lib-version: "v1.92.3"
128-
pr-base-branch: "main"
129-
pr-reviewers: JunaMeinhold
130-
pr-branch: backends-artifacts
131-
pr-manifest-path: imgui_impl
126+
lib-name: "ImGuiImpl"
127+
lib-version: "v1.92.4"
128+
pr-base-branch: "main"
129+
pr-reviewers: JunaMeinhold
130+
pr-branch: backends-artifacts
131+
pr-manifest-path: imgui_impl

.github/workflows/cmake-static.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,19 @@ jobs:
100100
checkout-self: true
101101

102102
create-pr:
103-
needs: [build-cimgui, build-cimplot, build-cimnodes, build-cimguizmo, build-cimplot3d]
103+
needs:
104+
[
105+
build-cimgui,
106+
build-cimplot,
107+
build-cimnodes,
108+
build-cimguizmo,
109+
build-cimplot3d,
110+
]
104111
uses: JunaMeinhold/cmake-actions/.github/workflows/create-pr.yml@v1.x.x
105112
with:
106-
lib-name: "ImGui"
107-
lib-version: "v1.92.3"
108-
pr-base-branch: "main"
109-
pr-reviewers: JunaMeinhold
110-
pr-branch: imgui-artifacts
111-
pr-manifest-path: imgui
113+
lib-name: "ImGui"
114+
lib-version: "v1.92.4"
115+
pr-base-branch: "main"
116+
pr-reviewers: JunaMeinhold
117+
pr-branch: imgui-artifacts
118+
pr-manifest-path: imgui

.github/workflows/cmake.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,19 @@ jobs:
100100
checkout-self: true
101101

102102
create-pr:
103-
needs: [build-cimgui, build-cimplot, build-cimnodes, build-cimguizmo, build-cimplot3d]
103+
needs:
104+
[
105+
build-cimgui,
106+
build-cimplot,
107+
build-cimnodes,
108+
build-cimguizmo,
109+
build-cimplot3d,
110+
]
104111
uses: JunaMeinhold/cmake-actions/.github/workflows/create-pr.yml@v1.x.x
105112
with:
106-
lib-name: "ImGui"
107-
lib-version: "v1.92.3"
108-
pr-base-branch: "main"
109-
pr-reviewers: JunaMeinhold
110-
pr-branch: imgui-artifacts
111-
pr-manifest-path: imgui
113+
lib-name: "ImGui"
114+
lib-version: "v1.92.4"
115+
pr-base-branch: "main"
116+
pr-reviewers: JunaMeinhold
117+
pr-branch: imgui-artifacts
118+
pr-manifest-path: imgui

Generator/cimgui/cimgui.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
2-
//based on imgui.h file version "1.92.3" 19230 from Dear ImGui https://github.com/ocornut/imgui
2+
//based on imgui.h file version "1.92.4" 19240 from Dear ImGui https://github.com/ocornut/imgui
33
//with imgui_internal.h api
44
//with imgui_freetype.h api
55
//docking branch
@@ -760,9 +760,10 @@ typedef enum {
760760
ImGuiBackendFlags_HasSetMousePos = 1 << 2,
761761
ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3,
762762
ImGuiBackendFlags_RendererHasTextures = 1 << 4,
763-
ImGuiBackendFlags_PlatformHasViewports = 1 << 10,
764-
ImGuiBackendFlags_HasMouseHoveredViewport=1 << 11,
765-
ImGuiBackendFlags_RendererHasViewports = 1 << 12,
763+
ImGuiBackendFlags_RendererHasViewports = 1 << 10,
764+
ImGuiBackendFlags_PlatformHasViewports = 1 << 11,
765+
ImGuiBackendFlags_HasMouseHoveredViewport=1 << 12,
766+
ImGuiBackendFlags_HasParentViewport = 1 << 13,
766767
}ImGuiBackendFlags_;
767768
typedef enum {
768769
ImGuiCol_Text,
@@ -821,6 +822,7 @@ typedef enum {
821822
ImGuiCol_TextSelectedBg,
822823
ImGuiCol_TreeLines,
823824
ImGuiCol_DragDropTarget,
825+
ImGuiCol_UnsavedMarker,
824826
ImGuiCol_NavCursor,
825827
ImGuiCol_NavWindowingHighlight,
826828
ImGuiCol_NavWindowingDimBg,
@@ -1164,7 +1166,7 @@ struct ImGuiIO
11641166
bool ConfigViewportsNoTaskBarIcon;
11651167
bool ConfigViewportsNoDecoration;
11661168
bool ConfigViewportsNoDefaultParent;
1167-
bool ConfigViewportPlatformFocusSetsImGuiFocus;
1169+
bool ConfigViewportsPlatformFocusSetsImGuiFocus;
11681170
bool ConfigDpiScaleFonts;
11691171
bool ConfigDpiScaleViewports;
11701172
bool MouseDrawCursor;
@@ -1727,6 +1729,7 @@ struct ImGuiViewport
17271729
ImVec2 WorkSize;
17281730
float DpiScale;
17291731
ImGuiID ParentViewportId;
1732+
ImGuiViewport* ParentViewport;
17301733
ImDrawData* DrawData;
17311734
void* RendererUserData;
17321735
void* PlatformUserData;
@@ -2397,8 +2400,8 @@ struct ImGuiKeyRoutingData
23972400
{
23982401
ImGuiKeyRoutingIndex NextEntryIndex;
23992402
ImU16 Mods;
2400-
ImU8 RoutingCurrScore;
2401-
ImU8 RoutingNextScore;
2403+
ImU16 RoutingCurrScore;
2404+
ImU16 RoutingNextScore;
24022405
ImGuiID RoutingCurr;
24032406
ImGuiID RoutingNext;
24042407
};
@@ -3163,6 +3166,7 @@ struct ImGuiContext
31633166
ImRect DragDropTargetRect;
31643167
ImRect DragDropTargetClipRect;
31653168
ImGuiID DragDropTargetId;
3169+
ImGuiID DragDropTargetFullViewport;
31663170
ImGuiDragDropFlags DragDropAcceptFlags;
31673171
float DragDropAcceptIdCurrRectSurface;
31683172
ImGuiID DragDropAcceptIdCurr;
@@ -4664,6 +4668,8 @@ CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
46644668
CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self);
46654669
CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void);
46664670
CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self);
4671+
CIMGUI_API void ImGuiPlatformIO_ClearPlatformHandlers(ImGuiPlatformIO* self);
4672+
CIMGUI_API void ImGuiPlatformIO_ClearRendererHandlers(ImGuiPlatformIO* self);
46674673
CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void);
46684674
CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self);
46694675
CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void);
@@ -5230,9 +5236,11 @@ CIMGUI_API void igPopFocusScope(void);
52305236
CIMGUI_API ImGuiID igGetCurrentFocusScope(void);
52315237
CIMGUI_API bool igIsDragDropActive(void);
52325238
CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect bb,ImGuiID id);
5239+
CIMGUI_API bool igBeginDragDropTargetViewport(ImGuiViewport* viewport,const ImRect* p_bb);
52335240
CIMGUI_API void igClearDragDrop(void);
52345241
CIMGUI_API bool igIsDragDropPayloadBeingAccepted(void);
5235-
CIMGUI_API void igRenderDragDropTargetRect(const ImRect bb,const ImRect item_clip_rect);
5242+
CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect bb);
5243+
CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect bb);
52365244
CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags);
52375245
CIMGUI_API int igTypingSelectFindMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);
52385246
CIMGUI_API int igTypingSelectFindNextSingleCharMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);

0 commit comments

Comments
 (0)