ocornut
|
773060155f
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2025-02-21 19:56:20 +01:00 |
|
ocornut
|
eec097fe35
|
Added ImGuiMouseCursor_Progress mouse cursor 8a35386+ support in SDL2,SDL3,Win32,Allegro5 backends.
Amend 8a35386
|
2025-02-18 18:52:08 +01:00 |
|
ocornut
|
8a35386ba7
|
Added ImGuiMouseCursor_Wait mouse cursor (busy/wait/hourglass shape) + support in SDL2,SDL3,Win32,Allegro5 backends.
|
2025-02-18 18:40:47 +01:00 |
|
ocornut
|
6e94f6cefb
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_internal.h
|
2025-01-20 18:04:31 +01:00 |
|
Julian Rachele
|
aa1b4ea861
|
Backends: OSX: Remove notification observer when shutting down. (#8331)
|
2025-01-20 09:24:43 +01:00 |
|
ocornut
|
960a6f14bf
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_metal.mm
# imgui.cpp
|
2025-01-08 14:36:14 +01:00 |
|
ocornut
|
a9cd0f5e42
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_allegro5.cpp
# backends/imgui_impl_allegro5.h
# backends/imgui_impl_android.cpp
# backends/imgui_impl_android.h
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl2.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2024-12-11 12:27:25 +01:00 |
|
ocornut
|
43fbd7ce84
|
Backends: standardized top of file comments.
|
2024-12-05 12:43:04 +01:00 |
|
ocornut
|
368123ab06
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui_draw.cpp
|
2024-11-07 19:58:23 +01:00 |
|
ocornut
|
419a9ada16
|
Ignore clang warning Wnontrivial-memaccess (#8129, #8135)
Amend 88e2327
Use void* cast in backend where the memset are infrequent.
|
2024-11-07 19:08:37 +01:00 |
|
ocornut
|
83660e37e3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glut.cpp
# backends/imgui_impl_glut.h
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_demo.cpp
|
2024-11-06 17:58:35 +01:00 |
|
ocornut
|
6f287dd16d
|
(Breaking) Removed pre-1.87 obsolete io.KeyMap[], io.KeysDown[], io.NavInputs[]. Remove IMGUI_DISABLE_OBSOLETE_KEYIO. (#4921)
|
2024-11-06 17:54:59 +01:00 |
|
Maya Warrier
|
88e232739b
|
Ignore clang warning Wnontrivial-memaccess (#8129)
Produced when memset(this, ..) is used on a non-trivially copyable type
|
2024-11-05 10:44:39 +01:00 |
|
ocornut
|
942b64abfc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-10-24 18:15:51 +02:00 |
|
ocornut
|
a908d73c16
|
Backends: avoid missing -Wmissing-declaration warning. (#8087, #7997)
|
2024-10-24 17:24:47 +02:00 |
|
ocornut
|
22503bfe75
|
Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)
|
2024-10-08 20:47:24 +02:00 |
|
ocornut
|
bc77cccd31
|
Merge branch 'master' into docking
|
2024-09-19 14:52:43 +02:00 |
|
ocornut
|
cfae5ac71b
|
Backends: make ImGui_ImplSDL2_KeyEventToImGuiKey(), ImGui_ImplSDL3_KeyEventToImGuiKey(), ImGui_ImplGlfw_KeyToImGuiKey(), ImGui_ImplWin32_KeyEventToImGuiKey(), ImGui_ImplAllegro5_KeyCodeToImGuiKey(), ImGui_ImplOSX_KeyCodeToImGuiKey(), non-static. (#7997)
Backends: Win32: Refactor ImGui_ImplWin32_KeyEventToImGuiKey() logic.
Ref #7672
|
2024-09-19 14:10:00 +02:00 |
|
ocornut
|
fed4841bd4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-08-22 20:26:59 +02:00 |
|
ocornut
|
214977e5fd
|
IO: (BREAKING) moved io.GetClipboardTextFn, io.SetClipboardTextFn to platform_io.Platform_GetClipboardTextFn, platform_io.Platform_SetClipboardTextFn.
|
2024-08-22 20:12:23 +02:00 |
|
ocornut
|
9ff60ae31d
|
IO: (BREAKING) moved GetIO().PlatformSetImeDataFn to GetPlatformIO(.Platform_SetImeDataFn. (#7660)
|
2024-08-22 20:11:55 +02:00 |
|
chenqiudu
|
aa0f6b37bd
|
Backends: OSX: fixed NSAppKitVersion version limit for setWantsBestResolutionOpenGLSurface usage. (#7814)
|
2024-07-23 15:20:38 +02:00 |
|
ocornut
|
3f61da7e8b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-07-02 17:48:38 +02:00 |
|
ocornut
|
fb799bba7f
|
(Breaking) IO, IME: renamed platform IME hook io.SetPlatformImeDataFn() -> io.PlatformSetImeDataFn() and added explicit context.
|
2024-07-02 15:48:32 +02:00 |
|
ocornut
|
0c2650e833
|
Backends: OSX: build fix. Amend 32f9dfc
|
2024-06-26 16:23:42 +02:00 |
|
ocornut
|
32f9dfc126
|
Viewports: Backported 'void* ImGuiViewport::PlatformHandle' from docking branch for use by backends.
|
2024-06-26 14:32:48 +02:00 |
|
ocornut
|
eabe98f6d5
|
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2024-05-14 16:29:06 +02:00 |
|
ocornut
|
5e23680454
|
Backends: all backends + demo now call IMGUI_CHECKVERSION() to verify ABI compatibility between caller code and compiled version of dear imgui. (#7568)
|
2024-05-13 15:07:13 +02:00 |
|
ocornut
|
e391fe2e66
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2024-05-08 16:17:32 +02:00 |
|
ocornut
|
d15574ce2a
|
Backends: Win32: Removed silent return when calling ImGui_ImplWin32_WndProcHandler() with no active context! (#6275)
Better standardized similar checks in other backends.
|
2024-05-07 16:53:03 +02:00 |
|
ocornut
|
77dff5a735
|
Backends: comments.
|
2024-02-28 11:06:40 +01:00 |
|
ocornut
|
2b662b1ab9
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2024-02-20 15:33:20 +01:00 |
|
John Melas
|
b19a4c5f2b
|
Backends: OSX: remove legacy clearing of io.NavInputs in ImGui_ImplOSX_UpdateGamepads(). (#7320)
|
2024-02-15 14:57:37 +01:00 |
|
ocornut
|
d79514c407
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-02-14 14:32:17 +01:00 |
|
actboy168
|
54ef4092a9
|
Backends: OSX: Fixed not submitting Monitors info when viewports are not enabled. (#7257)
|
2024-01-24 14:51:04 +01:00 |
|
ocornut
|
8deb1007cd
|
Backends: OSX: Fixed IME position in multi-monitor/multi-viewports setups. (#7028)
|
2024-01-09 22:36:01 +01:00 |
|
ocornut
|
a683033e49
|
Backends: OSX: Fixed monitor and window position by correctly transforming Y origin on multi-monitor setups. (#7028, #7101, #6009, #6432)
|
2024-01-09 22:21:57 +01:00 |
|
ocornut
|
f7fc186408
|
Merge branch 'master' into docking
+ 2 comments
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
|
2023-10-12 19:22:36 +02:00 |
|
ocornut
|
b0758c86d8
|
Backends: Added support for extra ImGuiKey values: F13 to F24 function keys. (#6891, #4921)
|
2023-10-05 20:39:49 +02:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
f8f805f046
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2023-07-20 23:18:47 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
530134d125
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2023-05-10 12:57:37 +02:00 |
|
Alex
|
70cca1eac0
|
Backends: avoid null dereference in metal and osx shutdown (#6385, #6334)
Co-authored-by: Alexander Rath <alex@ist.besonders.cool>
|
2023-05-04 17:18:29 +02:00 |
|
ocornut
|
adf693c061
|
Viewports: added void* ImGuiPlatformMonitor::PlatformHandle field (backend-dependant).
|
2023-04-21 15:31:14 +02:00 |
|
ocornut
|
1f2b84a654
|
Backends: clear viewport specific bits in io.BackendFlags on backend Shutdown(). (#6334)
Amend 055e715
|
2023-04-19 16:40:18 +02:00 |
|
ocornut
|
4f692ba840
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
|
2023-04-19 16:35:50 +02:00 |
|
Gereon V
|
055e71518e
|
Backends: clear bits set in io.BackendFlags on backend Shutdown(). Clear BackendPlatformName. (#6334, #6335)
Amended with fix for missing clear for ImGuiBackendFlags_HasGamepad.
|
2023-04-17 14:57:12 +02:00 |
|
ocornut
|
bed11b35d1
|
Fix typos and use nullptr in backends. Amend 506f7e0
|
2023-04-11 16:20:17 +02:00 |
|