ocornut
b39fc84f89
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-05-16 19:57:04 +02:00
Hubert Maier
07dbcf1f70
Fixed typos. ( #7593 )
2024-05-16 16:13:01 +02:00
ocornut
93daf23223
Examples: SDL3: updates for latest SDL3 API changes.
2024-05-15 14:18:48 +02:00
kuvaus
e45efa9951
Backends: SDL3: Rename SDLK_QUOTE and SDLK_BACKQUOTE to SDLK_APOSTROPHE and SDLK_GRAVE. ( #7580 )
2024-05-15 14:11:54 +02:00
ocornut
5d973a87d4
Backends: SDL_Renderer2/SDL_Renderer3: and ImGui_ImplSDLRenderer2_RenderDrawData() and ImGui_ImplSDLRenderer3_RenderDrawData() now takes a SDL_Renderer* parameter.
2024-05-15 13:44:54 +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
ac90e1bd5b
Backends: Win32: replace bd != nullptr assert with early out. ( #6275 )
...
+ fixed inconsistent use of break vs return 0 in WndProcHandler (had no tangible effect).
2024-05-14 12:18:10 +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
0d483a1c89
Backends: OpenGL3: Update loader for Linux to support EGL/GLVND. ( #7562 )
...
+ #6983
2024-05-07 18:23:29 +02:00
ocornut
92df32d339
Backends: OpenGL3: minor update of generated loader to match latest downloaded glcorearb.h/khrplatform.h files.
2024-05-07 17:46:36 +02:00
ocornut
1ab1af80c7
Backends: Win32: Facepalm revert part of d15574c
+ additional commentary ( #6275 )
2024-05-07 17:03:51 +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
Rory O'Connell
8b2c6dd42f
Backends: Vulkan: reworked swap-chain resize handling for secondary viewports to work with typical Linux setups. ( #2626 , #3390 , #3758 , #7508 , #7513 )
2024-05-07 16:14:15 +02:00
Sandro Cavazzoni
ebb8d78102
Backends: Vulkan: Create a custom pipeline for secondary viewports. ( #6325 , #6305 , #7398 , #3459 , #3253 , #3522 )
...
Edited from original commit: moved ImGui_ImplVulkan_CreatePipeline() call from ImGui_ImplVulkanH_CreateOrResizeWindow() to ImGui_ImplVulkan_CreateWindow().
2024-04-30 15:37:36 +02:00
ocornut
49e70e60a2
Backends: Vulkan: Stripped misleading leftover of ImGui_ImplVulkanH_Window::Pipeline ( #6325 , #6305 , #7398 , #3459 , #3253 , #3522 )
...
As this is currently unused and misleading. Next commit will add a separate pipeline for secondary viewport.
2024-04-30 15:37:36 +02:00
ocornut
5717f0a33e
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
2024-04-30 10:42:46 +02:00
Lukas Lipp
a60387a3c2
Backends: GLFW: Add define guards for glfw native defines. ( #7536 )
2024-04-29 19:24:17 +02:00
ocornut
b720c0f541
Backends: Vulkan: Added convenience support for Volk via IMGUI_IMPL_VULKAN_USE_VOLK define. ( #6582 , #4854 )
2024-04-19 15:47:26 +02:00
ocornut
07e8ff9a8d
Backends: Win32: Fixed a warning + moved header cruft below Changelog.
2024-04-18 21:26:49 +02:00
ocornut
b555984a94
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
2024-04-18 21:18:18 +02:00
ocornut
9ec299ebe3
Backends: OpenGL: Detect ES3 contexts on desktop based on version string, ( #7447 )
2024-04-16 16:18:51 +02:00
ocornut
4cb0fe3c7d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# docs/CHANGELOG.txt
# imgui_internal.h
2024-04-16 14:24:13 +02:00
ocornut
7b8107e7c8
Examples: GLFW+WebGPU: Rename example_emscripten_wgpu/ to example_glfw_wgpu/ ( #7435 , #7132 )
2024-04-16 14:16:32 +02:00
Green Sky
fab96a6e59
Backends: SDL3: Re-enable calling SDL_StartTextInput()/SDL_StopTextInput(). ( #7452 , #6306 , #6071 , #1953 )
...
Amend: a7703fe
2024-04-15 12:25:42 +02:00
ocornut
1db579d458
Merge branch 'master' into docking
2024-04-11 16:21:56 +02:00
Elie Michel
8be48a44f7
Backends: WebGPU: Avoid using -1u literal ( #7436 )
2024-03-25 11:10:38 +09:00
ocornut
085781f5ca
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-03-18 22:52:40 -07:00
Robert Edmonds
da29b776ee
Backends: SDL3: Fix leak of SDL_GetGamepads() return value ( #7381 )
2024-03-11 11:04:56 +01:00
ocornut
77dff5a735
Backends: comments.
2024-02-28 11:06:40 +01:00
ocornut
4e8c43f6b7
Backends: Win32: made it so that an appearing viewport showing up doesn't bring its parent viewport to front. ( #7354 )
2024-02-27 20:02:26 +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
8048b52498
Backends: GLFW: enable ImGuiBackendFlags_HasMouseHoveredViewport support with GLFW 3.3.x. ( #7316 )
2024-02-15 14:50:45 +01:00
ocornut
c66a1e7d51
Backends: Vulkan: ImGui_ImplVulkan_CreateWindow() amend merge to take account of PipelineRenderingCreateInfo change. ( #7166 , #6855 , #5446 , #5037 )
2024-02-14 14:39:26 +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
Shawn Hatori
f80e65a406
Backends:,Examples: Vulkan: moved RenderPass parameter from ImGui_ImplVulkan_Init() function to ImGui_ImplVulkan_InitInfo structure. ( #7308 )
2024-02-14 13:56:46 +01:00
ocornut
829f45df99
Backends: SDL2: removed obsolete ImGui_ImplSDL2_NewFrame(SDL_Window*) signature which was obsoleted in 1.84..
2024-02-14 12:06:21 +01:00
ocornut
891b81fc5d
Backends: SDL3: Fixed gamepad. Added support for disconnection. Added support for multiple gamepads. Added ImGui_ImplSDL3_SetGamepadMode(). ( #7180 , #3884 , #6559 , #6890 )
2024-02-14 11:37:18 +01:00
ocornut
262e30e300
Backends: SDL2: rework new API as ImGui_ImplSDL2_SetGamepadMode(). ( #3884 , #6559 , #6890 , #7180 )
...
Code is simpler this way.
2024-02-14 11:30:43 +01:00
ocornut
d15e4100b8
Backends: SDL2: Amend new API, all support for multiple gamepads. ( #3884 , #6559 , #6890 )
2024-02-13 18:55:14 +01:00
ocornut
f966da1f8f
Backends: SDL2: Gamepad handlng: amend bf1c96d
. ( #3884 , #6559 , #6890 )
2024-02-13 16:31:33 +01:00
ocornut
bf1c96d4fa
Backends: SDL2: Handle gamepad disconnection + fixed increasing refcount. Added ImGui_ImplSDL2_SelectGamepadAuto()/ImGui_ImplSDL2_SelectGamepadExplicit(). ( #3884 , #6559 , #6890 )
2024-02-13 16:24:44 +01:00
ocornut
fd8d6dc5d1
Backends: SDL2,SDL3: tidying up.
2024-02-13 15:49:49 +01:00
ocornut
e0ba0d0433
Backends: Vulkan: Fixes for building with pre Vulkan 1.3. Amend 8901931
. ( #7166 )
2024-02-12 18:46:01 +01:00
ocornut
11d73f03ee
Backends: Vulkan: Fix/amend 8901931
2024-02-12 17:18:52 +01:00
Shawn Hatori
89019319dd
Backends: Vulkan: use PipelineRenderingCreateInfo for dynamic rendering ( #7166 , #6855 , #5446 , #5037 )
2024-02-12 16:55:00 +01:00
璀境石
1d6f0cea0e
Backends: DX9: use RGBA texture to avoid conversion if supported
2024-02-12 16:05:10 +01:00
ocornut
2af01baffd
Backends: SDLRenderer3: query newly added SDL_RenderViewportSet() to not restore a wrong viewport if none was initially set.
...
https://github.com/libsdl-org/SDL/issues/9029
2024-02-12 14:57:39 +01:00
ocornut
82eeafc196
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
2024-02-07 22:10:33 +01:00
Bruce Mitchener
f50ddc431e
Fixed some typos. ( #7282 )
2024-02-01 18:30:00 +01:00
ocornut
1509842107
Backends: OpenGL3: Shallow tweak of compile-time extensions detection.
...
Detect polygon mode using same method as others (not define/symbol).
IMGUI_IMPL_OPENGL_MAY_HAVE_EXTENSIONS -> IMGUI_IMPL_OPENGL_HAS_EXTENSIONS
2024-01-24 15:21:46 +01:00
Clément Gallet
1ce41f6218
Backends: OpenGL3: Backup and restore GL_PIXEL_UNPACK_BUFFER. ( #7253 )
...
Amended with (bd->GlVersion >= 210) checks.
2024-01-24 15:01:59 +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
eb42e164dd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
2024-01-22 19:01:25 +01:00
rajveermalviya
9266c0d2d1
Backends: WebGPU: Avoid leaking pipeline layout. ( #7245 )
2024-01-22 15:37:00 +01:00
ocornut
5fc0a361b2
Backends: WebGPU: added ImGui_ImplWGPU_InitInfo::PipelineMultisampleState. ( #7240 )
2024-01-22 14:54:45 +01:00
ocornut
831d42c1ab
Backends: WebGPU: ImGui_ImplWGPU_Init() now takes a ImGui_ImplWGPU_InitInfo structure instead of variety of parameters, allowing for easier further changes. ( #7240 )
2024-01-22 14:53:30 +01:00
Frank McCoy
15908502ed
Backends: Vulkan: Define NOMINMAX when VK_USE_PLATFORM_WIN32_KHR is defined. ( #7250 )
2024-01-22 11:15:14 +01:00
ocornut
5ddfbb80d8
Backends: Vulkan: Fixed vkAcquireNextImageKHR() validation errors in VulkanSDK 1.3.275 by allocating one extra semaphore than in-flight frames. ( #7236 )
2024-01-19 14:52:33 +01:00
ocornut
01b99a974d
Backends: Vulkan: Fixed vkAcquireNextImageKHR() validation errors in VulkanSDK 1.3.275 by allocating one extra semaphore than in-flight frames. ( #7236 )
2024-01-19 14:50:46 +01:00
ocornut
cab7edd135
Merge branch 'master' into docking
...
# Conflicts:
# imgui_internal.h
2024-01-17 18:38:03 +01:00
ocornut
03417cc77d
Backends: WebGPU: Filling all WGPUDepthStencilState fields explicitly as a recent Dawn update stopped setting default values. ( #7232 )
2024-01-17 13:26:02 +01:00
ocornut
a27f22f0e9
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui_internal.h
2024-01-16 11:43:36 +01:00
ocornut
6228c2e1ec
Backends: Vulkan: moved ImGui_ImplVulkanH_DestroyFrameRenderBuffers/ImGui_ImplVulkanH_DestroyWindowRenderBuffers as they are always used in a state where backend data is available.
2024-01-11 20:22:37 +01:00
ocornut
70bb6d1e79
Backends: Vulkan: Fixed vkMapMemory() calls unnecessarily using full buffer size. ( #3957 )
2024-01-11 14:57:38 +01:00
Tristan Gouge
82df7c8bf4
Backends: Vulkan: Fixed handling of ImGui_ImplVulkan_InitInfo::MinAllocationSize field. ( #7189 , #4238 )
2024-01-11 14:43:51 +01:00
ocornut
2dc85e6e43
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2024-01-10 18:34:23 +01:00
ocornut
a3eea8a75a
Backends: OpenGL3: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" and variants, fixing regression on distros missing a symlink. ( #6983 )
...
Amend 0f50b52da
2024-01-09 23:26:05 +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
e3d7cd665d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_vulkan.cpp
2024-01-03 18:33:44 +01:00
ocornut
6f10cef2a1
Backends: Vulkan: moved structure declarations.
...
This is mostly to facilitate maintainance of #6616 .
2024-01-03 16:19:03 +01:00
ocornut
0ea99132c8
Backends: Vulkan: Stop creating command pools with VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT as we don't reset them.
2024-01-03 14:11:40 +01:00
Tristan Gouge
4778560e66
Backends: Vulkan: Added MinAllocationSize field in ImGui_ImplVulkan_InitInfo to workaround zealous validation layer. ( #7189 , #4238 )
2024-01-03 12:17:08 +01:00
Axel Paris
e8dd47effa
Backends: WebGPU: Fixing an issue when opening a popup in the wgpu backend ( #7191 )
...
Amend 2b0bd40b9
2024-01-03 12:05:37 +01:00
kida22
240ab5890b
Backends: GLFW, Input: Use Unicode version of WndProc for get correct input for text in utf-8 code page. ( #7174 )
...
Similar to #6785 , #6782 , #5725 , #5961 for for GLFW backend.
2023-12-29 18:21:21 +01:00
Kai Wang
20e1caec85
Backends: DX12: Changed swapchain scaling mode to DXGI_SCALING_NONE
. ( #7152 , #7153 )
2023-12-21 14:18:43 +01:00
ocornut
4aa81116a5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# imgui.cpp
2023-12-20 23:57:19 +01:00
ocornut
33d426842d
Backends: Vulkan: ImGui_ImplVulkan_CreateFontsTexture() calls vkQueueWaitIdle() instead of vkDeviceWaitIdle(). ( #7148 , #6943 , #6715 , #6327 , #3743 , #4618 )
2023-12-19 18:25:09 +01:00
ocornut
3cb805489b
Backends: GLFW, Emscripten: fixes for canvas resizing, amends. ( #6751 )
...
Amend 22a7d24
2023-12-19 16:09:44 +01:00
Pello Rao
22a7d241ff
Backends: GLFW, Emscripten: fixes for canvas resizing. ( #6751 )
2023-12-19 15:56:31 +01:00
ocornut
8764a1b7c4
Backends: Vulkan: free FontCommandBuffer explicitely (not actually required in normal code path, unless ImGui_ImplVulkan_DestroyDeviceObjects is declared directly). ( #7104 )
2023-12-19 10:51:15 +01:00
ocornut
8add6bcb9f
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2023-12-14 17:21:15 +01:00
Anılcan Gülkaya
9a2985611c
Backend: Android: Remove Redundant Check ( #7093 )
2023-12-06 04:29:40 +01:00
ocornut
96b5b1724b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
2023-12-05 12:20:16 +01:00
ocornut
b4b864e40a
Backends: Vulkan: Fixed mismatching allocator passed to vkCreateCommandPool() vs vkDestroyCommandPool(). ( #7075 )
2023-11-29 14:24:25 +01:00
ocornut
c6ec69c7c1
Using nullptr in remaining examples/backends locations. ( #6313 , #7071 , #4537 )
2023-11-28 19:29:17 +01:00
ocornut
888834c636
Backends: Android: Fixed build breaking typo. ( #7060 )
...
Amend 86891b0
. My bad for not testing this.
2023-11-28 15:23:45 +01:00
ocornut
f6253b87d0
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
2023-11-28 14:39:46 +01:00
ocornut
86891b0986
Backends: Android: ImGui_ImplAndroid_HandleInputEvent() takes a const AInputEvent* ( #7060 )
2023-11-28 12:08:05 +01:00
ocornut
3733b5064e
Backends: SDL3: Fixed unused variable warning on master on some targets. ( #7000 )
2023-11-17 12:28:25 +01:00
codefrog2002
c5c1c4134b
Backends: OpenGL3: imgui_impl_opengl3_loader.h: change #define ARRAY_SIZE to GL3W_ARRAY_SIZE to avoid external conflicts ( #7017 , #7018 )
2023-11-16 01:38:47 +01:00
Oliver Eriksson
6695006bea
Backends: Vulkan: use specified ColorAttachmentFormat when creating a secondary window when enabling UseDynamicRendering. ( #6999 , #5446 , #5037 )
2023-11-15 14:53:32 +01:00
ocornut
0941adc931
Backends: SDL3: Updates for recent API changes. ( #7000 ) (w/ multi-viewports version)
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
2023-11-13 16:24:50 +01:00
ocornut
add915bdc4
Backends: SDL3: Updates for recent API changes. ( #7000 )
2023-11-13 16:21:18 +01:00
ocornut
9d950444a2
Backends: Vulkan: Fixes for VK_NO_PROTOTYPES (docking merge + reorder docking only bits)
...
Amend for 6e7b43b,79a9e2f
2023-11-10 15:40:41 +01:00
ocornut
44dbad64d7
Backends: Vulkan: Fixes for VK_NO_PROTOTYPES.
...
Amend for 6e7b43b,79a9e2f
2023-11-10 15:10:27 +01:00
ocornut
450f1d7e7b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
2023-11-10 14:56:10 +01:00
ocornut
79a9e2fdfb
Backends: Vulkan: (Breaking) full font upload is performed by ImGui_ImplVulkan_CreateFontsTexture(), no need for user code to create or provide a command-buffer. Removed ImGui_ImplVulkan_DestroyFontUploadObjects(). ( #6943 , #6715 , #6327 , #3743 , #4618 )
...
See changes in example_glfw_vulkan/main.cpp and example_sdl2_vulkan/main.cpp for reference.
2023-11-10 14:53:34 +01:00
ocornut
6e7b43b6c7
Backends: Vulkan: Added ImGui_ImplVulkan_DestroyFontsTexture(), made ImGui_ImplVulkan_CreateFontsTexture() destroy previous one. ( #6943 , #6715 , #6327 , #3743 , #4618 )
2023-11-10 14:53:06 +01:00
ocornut
ab522dd18c
Removed IM_OFFSETOF() macro in favor of using offsetof() available in C++11. Kept redirection define. ( #4537 )
2023-11-09 16:44:39 +01:00
ocornut
0f50b52da4
Backends: OpenGL3: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" instead of "libGL.so.1". ( #6983 )
2023-11-09 12:38:56 +01:00
Luca Lolli
04e9a2fac1
Backends: SDL3: rename SDL_EVENT_DISPLAY ( #6974 )
...
SDL3 display events have been renamed
2023-11-01 13:53:30 +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
001f102f38
IO, Backends: added ImGuiKey_AppBack, ImGuiKey_AppForward. ( #6891 , #4921 )
2023-10-05 21:26:07 +02:00
ocornut
7bbd758681
Backends: Win32: revert oops chunk.
...
Amend b0758c8
2023-10-05 20:58:25 +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
72ebd91567
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
2023-10-05 15:10:45 +02:00
Nicolas "Pixel" Noble
64b1aeebf5
Backends: OpenGL3: rename gl3w's loader symbols to allow LTO compilation with another copy of gl3w. ( #6875 , #6668 , #4445 )
2023-10-05 11:03:28 +02:00
ocornut
9064dbd404
Backends: DX9: Fixed incorrect assert triggering on reopening session with minimized windows. ( #3424 )
2023-10-02 15:28:22 +02:00
ocornut
d27b4ad366
Backends: GLFW: support for case where secondary viewport WndProc is not the same as main viewport one. ( #6889 )
2023-10-02 12:09:13 +02:00
ocornut
17bfafda55
Backends: GLFW: moved WndProc hook to bottom of file + rename a field. ( #6889 )
...
No functional change in this commit.
2023-10-02 12:09:08 +02:00
ocornut
bb2fb74645
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
2023-09-26 11:42:49 +02:00
ocornut
12ee2dd789
Backends: Win32: Synthesize key-down event on key-up for VK_SNAPSHOT / ImGuiKey_PrintScreen as Windows doesn't emit it. ( #6859 )
2023-09-25 10:58:29 +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
72dbe45adc
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
2023-09-08 18:02:06 +02:00
sneakyevil
c9d3c29aa3
Backend: Win32: support keyboard codepage conversion for when compiling in MBCS mode and creating a non-Unicode window. ( #6785 , #6782 , #5725 )
2023-09-07 14:08:58 +02:00
Deal
56a7b8b724
Backends: GLFW: Clear emscripten's MouseWheel callback before shutdown. ( #6790 , #6096 , #4019 )
2023-09-06 11:49:23 +02:00
ocornut
475453668d
Backends: SDL2/SDL3: Fixed bad merge in docking branch ( #6735 )
2023-08-26 11:45:21 +02:00
ocornut
676497fe05
Merge branch 'master' into docking
...
ac64b65
on master seemed incorrect.
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2023-08-25 14:20:51 +02:00
ocornut
162f8e01aa
Backends: SDL3: fixed typo in 1e17d59
( #6735 )
2023-08-21 13:12:50 +02:00
ocornut
1161301386
Backends: amend "Missing features" sections for multi-viewports support.
2023-08-15 13:02:56 +02:00
ocornut
1e17d59965
Backends: SDL2,SDL3: added ImGui_ImplSDL2_InitForOther() / ImGui_ImplSDL3_InitForOther().
...
e.g. WebGPU users use a similarly named functions from GLFW backend.
2023-08-15 12:48:46 +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
scorpion-26
e5977f05d8
Backends: GLFW: revert support for GLFW_CURSOR_DISABLED, let user use ImGuiConfigFlags_NoMouse. ( #5625 , #6609 )
2023-07-18 11:49:43 +02:00
williamhCode
3dc3aef8a4
Backends: WebGPU: fix webgpu changes for Dawn. ( #6602 , #6188 )
2023-07-13 12:42:08 +02:00
ocornut
0e8eb8c48e
Removed _MSC_VER <= 1500 checks for Visual Studio 2008 or earlier.
...
Our codebase requires VS2012+ since a while.
2023-07-13 12:38:16 +02:00
ocornut
33e13c85e1
Backends: Made all backends sources files support global IMGUI_DISABLE. ( #6601 )
2023-07-13 11:27:52 +02:00
ohthesetrees
8566fec661
Backends: SDL3: Changing SDL_WINDOW_SKIP_TASKBAR to SDL_WINDOW_UTILITY for SDL3 ( #6573 )
2023-07-05 11:01:56 +02:00
sean
ac8573884d
Backends: Vulkan: Amends for docking branch. ( #5446 , #5037 )
2023-07-04 15:02:21 +02:00
ocornut
677c7b2258
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# docs/CHANGELOG.txt
# docs/TODO.txt
2023-07-04 14:58:03 +02:00
ocornut
121072cfe6
Backends: Vulkan: Amend for support for dynamic_rendering ( #5446 , #5037 )
...
Simplified for master branch.
# Conflicts:
# backends/imgui_impl_vulkan.cpp
2023-07-04 14:16:28 +02:00
sean
7812e836e4
Backends: Vulkan: Support for dynamic_rendering ( #5446 , #5037 )
...
Co-authored-by: Caio Oliveira <cmarcelo@gmail.com>
Simplified for master branch.
# Conflicts:
# backends/imgui_impl_vulkan.cpp
2023-07-04 14:01:27 +02:00
ocornut
6b01114057
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
2023-06-23 16:04:13 +02:00
ocornut
cb5542bce5
Backends: OpenGL3: Fixed erroneous use glGetIntegerv(GL_CONTEXT_PROFILE_MASK) on contexts lower than 3.2. ( #6539 , #6333 )
2023-06-20 15:30:52 +02:00
ocornut
1450d23b60
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2023-06-20 15:12:09 +02:00
ocornut
b9db5c566b
Backends: Win32: Added support for updating ParentViewportID after viewport creation.
...
This tends to be desirable for applicaton manipulating this value via ImGuiWindowClass::ParentViewportID.
I thought it would be a simple call to SetParent(), it's only slightly more complicated but added comments about it.
2023-06-15 11:26:27 +02:00
ocornut
884e3fd21f
Backends: GLFW: Accept glfwGetTime() not returning a monotonically increasing value. ( #6491 , #6189 , #6114 )
2023-06-12 11:58:17 +02:00
ocornut
dec082ff97
Backends: OpenGL3: Fixed support for glBindSampler() backup/restore on ES3. ( #6375 , #6508 )
...
Amend dd9db5e8
+ 39f7248d4
2023-06-12 11:45:11 +02:00
Luca Lolli
8fd0a04135
Backends: SDL3: Fix backend in docking/multi-viewports branch. ( #6483 )
...
The definition has been renamed to SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED.
Display scale is no longer available in SDL_DisplayMode but can be retrieved using SDL_GetDisplayContentScale.
2023-06-01 11:30:26 +02:00
ocornut
823a1385a2
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdlrenderer.h
# docs/CHANGELOG.txt
# imgui.cpp
2023-05-31 14:51:56 +02:00
ocornut
b476184574
Backends: SDLRenderer3: Amend/finish SDL_Renderer3 patch + add example. ( #6286 )
2023-05-30 20:36:07 +02:00
Andrea Carcone
0b57c07c79
Backends: SDL3: Add SDL_Renderer for SDL3 implementation. ( #6286 )
...
This is mostly a duplicate of SDL2 version with a few changes:
SDL_GetRenderScale -> SDL_RenderGetScale
SDL_ScaleModeLinear -> SDL_SCALEMODE_LINEAR
2023-05-30 20:30:30 +02:00
ocornut
b709b02e96
Backends: SDL_Renderer2: renamed all functions accordingly. ( #6286 )
2023-05-30 20:15:31 +02:00
ocornut
88e7d773df
Backends: SDL_Renderer2: Renamed 'imgui_impl_sdlrenderer.h/cpp' to 'imgui_impl_sdlrenderer2.h/cpp' ( #6286 )
2023-05-30 20:11:19 +02:00
S41L0R
f0f3b927e0
Backends: GLFW: Avoid linking with GLFW function for homebrew switch ( #6473 )
2023-05-30 10:27:21 +02:00
slowriot
6cc967a124
Backends: GLFW: Only enable Vulkan support if not building with Emscripten ( #6468 )
2023-05-28 18:08:06 +02:00
omar
2e810d575c
Backends: GLFW: Fix breaking typo 19b436f68
( #5683 , #6459 )
2023-05-26 13:41:45 +02:00
ocornut
19b436f68d
Backends: GLFW: Preserve monitor list when there are no monitor. ( #5683 )
2023-05-25 15:38:35 +02:00
ocornut
52e19113f3
Backends: OpenGL3: Added more explicit comments about using GL ES2/3 on targets where it's not automatic. ( #6450 )
2023-05-23 11:43:16 +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
Jason Millard
39f7248d4a
Backends: OpenGL3: Add glBindSampler for GL ES 3.0. ( #6375 )
...
Amended given addition of GlProfileIsES3 in dd9db5e
2023-05-09 15:17:18 +02:00
ocornut
dd9db5e889
Backends: OpenGL3: Added runtime flags for ES2/ES3 to simplify coding-style. ( #6375 )
2023-05-09 15:09:47 +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
5dc6013713
Backends: SDL3: Fixed build on Emscripten/iOS/Android. ( #6391 )
2023-05-04 17:06:36 +02:00
ocornut
c11128891e
Backends: SDL2/SDL3: Update monitor list when receiving a display event. ( #6348 )
2023-04-21 15:40:14 +02:00
ocornut
adf693c061
Viewports: added void* ImGuiPlatformMonitor::PlatformHandle field (backend-dependant).
2023-04-21 15:31:14 +02:00
ocornut
07e07030a6
Backends: Win32: revert accidental deletion of ImGui_ImplWin32_EnableAlphaCompositing() in a566ecc
( #3218 )
...
This was still in docking, but moved back in upper locaton.
# Conflicts:
# backends/imgui_impl_win32.cpp
2023-04-20 10:41:03 +02:00
ocornut
a89590b425
Backends: Win32: revert accidental deletion of ImGui_ImplWin32_EnableAlphaCompositing() in a566ecc
( #3218 )
2023-04-20 10:38:45 +02:00
ocornut
88ac2ced7c
Backends: DX10: Fixed typo in previous commit.
2023-04-19 17:18:04 +02:00
ocornut
f498f084d6
Examples: Amend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:48:07 +02:00
Mark Jansen
4bc51c6ff4
Examples: Extend Win32/Winapi + OpenGL example for multi-viewport. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:46:54 +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
ocornut
9308cfdcfb
Examples: Amend Win32/Winapi + OpenGL example. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
2023-04-19 16:28:15 +02:00
Mark Jansen
a566ecc58f
Examples: Add Win32/Winapi + OpenGL example. ( #3218 , #5170 and #6086 , #2772 , #2600 , #2359 , #2022 , #1553 )
...
Removed mulit-viewpot stuff in this commit on master, will be re-added separately.
2023-04-19 16:22:53 +02:00
ocornut
a338b78eb9
Backends: OpenGL3: amend reset GL_POLYGON_MODE separately for front and back when possible. ( #6333 )
2023-04-19 11:55:40 +02:00
Gereon V
d0836aa89a
Backends: OpenGL3: reset GL_POLYGON_MODE separately for front and back when possible. ( #6333 )
2023-04-19 11:55:36 +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
Gereon V
f304603e13
Backends: GLUT: remove call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame(). ( #6337 )
2023-04-17 14:44:56 +02:00
ocornut
bed11b35d1
Fix typos and use nullptr in backends. Amend 506f7e0
2023-04-11 16:20:17 +02:00
ocornut
aec062a8a5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# examples/example_win32_directx9/main.cpp
# imgui_internal.h
2023-04-11 16:16:17 +02:00
Elie Michel
d81f2ae4fb
Backends: WebGPU: Use WGSL shaders instead of precompiled SPIR-V + add Gamma uniform. ( #6188 )
...
Add gamma correction uniform
Group uniforms in a single binding
The second binding was not satisfying the minimum
BufferBindingType::Uniform alignment (256) and since this alignment is
large it is more idiomatic to group uniforms tegether.
Also ensures that the size of the uniform buffer is aligned to 16 bytes.
2023-04-11 16:03:26 +02:00
Elie Michel
e67f2f4791
Backends: WebGPU: Align buffer sizes upon creation. ( #6188 )
...
Amend from original pr to use a macro.
2023-04-11 15:46:05 +02:00
ocornut
cbdac1e150
Backends: WebGPU: Reorganized to store data in io.BackendRendererUserData like other backends.
...
In theory supporting multiple contexts (untested).
2023-04-11 15:25:21 +02:00
Michael Martz
506f7e0074
Using nullptr in locations where warning disable is not convenient. ( #6313 , #4537 )
2023-04-11 11:33:50 +02:00
ocornut
9203883bbe
Comments + Metal using SetTexID(0) for consistency.
2023-04-11 11:22:42 +02:00
David Maas
e92b29ad53
Backends: OSX: Added support for io.AddMouseSourceEvent(). ( #6314 )
...
Also marked "mouse" input in example_apple_metal's UIKit micro-backend as being touch input.
# Conflicts:
# docs/CHANGELOG.txt
2023-04-11 10:14:53 +02:00
David
db4c4e3321
Backends: Android: Added support for io.AddMouseSourceEvent(). ( #6315 , #6318 , #2702 , #4921 )
2023-04-11 10:01:53 +02:00
ocornut
1668693bcf
Backends: SDL2/SDL3: Fixed IME text input rectangle position with viewports. ( #6071 , #1953 )
2023-04-06 19:18:15 +02:00
ocornut
ec461c6ccb
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui_demo.cpp
2023-04-06 19:16:08 +02:00
ocornut
a7703fe6f7
Backends: SDL2/SDL3: Avoid callng SDL_StartTextInput()/SDL_StopTextInput(). ( #6306 , #6071 , #1953 )
...
Amend 734c6af187
2023-04-06 19:12:10 +02:00
ocornut
ee5ce36745
Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
2023-04-04 21:17:47 +02:00
ocornut
f070497cbd
Backends: Win32/SDL2/SDL3/GLFW: Added support for io.AddMouseSourceEvent(). ( #2334 , #2702 )
...
SDL doesn't distinguish Pen yet, but we don't need it as much as TouchScreen which will alter trickling.
2023-04-04 20:19:01 +02:00
ocornut
4fdafef54f
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# imgui_widgets.cpp
2023-03-29 18:41:41 +02:00
ocornut
8a6911b894
Backends: Fixes zealous warnings ( #5760 )
2023-03-23 18:18:52 +01:00
ocornut
7dcf129b3b
Backends: OpenGL3: Properly restoring "no shader program bound". ( #6267 , #6220 , #6224 )
2023-03-23 13:27:55 +01:00
Bruno Perković
5320a6ebd3
Backends: Made SDL3 backend compatible with commit 698dbd8. ( #6255 , #6146 )
2023-03-21 12:17:54 +01:00
ocornut
6b3435a2db
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
2023-03-16 12:01:13 +01:00
Aiekick
91577c7f51
Backends: GLFW: Fixed key modifiers handling on secondary viewports. ( #6248 , #6034 )
2023-03-16 11:59:45 +01:00
ocornut
85beda96de
Backends: GLFW: Fix Emscripten erroneously enabling multi-viewport support, leading to assert. ( #5683 )
2023-03-15 14:51:46 +01:00
ocornut
0d606968d8
Backend: OpenGL3: Amend b0c18166
fix cases where glGetString(GL_VERSION) returns NULL. ( #6154 , #4445 , #3530 )
2023-03-15 12:25:34 +01:00
ocornut
9e30fb0ec1
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2023-03-14 16:38:22 +01:00
ocornut
e39c2552ac
Backends: GLFW: Avoid using glfwGetError() and glfwGetGamepadState() on Emscripten. ( #6240 )
2023-03-14 16:00:29 +01:00
ocornut
4078abe14c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
2023-03-06 17:03:55 +01:00
Cyphall
66b762577c
Backends: OpenGL3: Fixed restoration of a potentially deleted OpenGL program. ( #6220 , #6224 )
2023-03-06 11:55:55 +01:00
Adam Kewley
2496b973f9
Backends: SDL2,SDL3: Accept SDL_GetPerformanceCounter() not returning a monotonically increasing value. ( #6189 , #6114 , #3644 )
2023-02-23 15:07:15 +01:00
ocornut
e25e4526cd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
2023-02-15 18:18:47 +01:00