mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-12-24 23:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,463 Commits 9 Branches 149 Tags
e55415bfef6b495adbfe9adabaacbd7e8151ec6c
Commit Graph

1704 Commits

Author SHA1 Message Date
ocornut
e55415bfef (Breaking) renamed/moved ImGuiConfigFlags_DpiEnableScaleFonts -> ioConfigDpiScaleFonts, ImGuiConfigFlags_DpiEnableScaleViewports -> io.ConfigDpiScaleViewports 2025-06-11 15:02:06 +02:00
ocornut
a92b53df7b Backends: Win32: Viewports: handle WM_DPICHANGED in backend when ImGuiConfigFlags_DpiEnableScaleViewports flag is enabled. 2025-06-02 19:21:22 +02:00
ocornut
c008c7d494 Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2025-05-15 14:45:15 +02:00
ocornut
c90ea1315a Viewports: added per-viewport FramebufferScale, Platform_GetWindowFramebufferScale() + Backends: GLFW, SDL2, SDL3, Apple: added support. (#1065, #1542, #1676, #1786, #2826, #3757, #5081, #5580, #5592, #6465, #7273, #7779 etc.) 
)

Metal backend is not in charge of writing to DpiScale/FramebufferScale (tho it was a neat workaround).
 2025-05-15 14:43:30 +02:00
ocornut
b5a73033ab Examples: Apple: Amend build scripts and gitignore, fix misc OSX warnings. (#8637) 
# Conflicts:
#	backends/imgui_impl_metal.mm
 2025-05-14 18:23:31 +02:00
Pascal Thomet
2df9e9b103 Examples: Apple: add Makefile for example_apple_metal, example_apple_opengl2. (#8637) 
- Works only for macOS: use XCode for iOS
- It will produce a raw exe. It will not a produce an macOS application bundle (i.e a folder that includes exe and resources). To get app bundles, use the XCode project.
- An adjustment was required in main.mm (for macOS only), to ensure that the exe can run without any plist or storyboard under macOS
 2025-05-14 18:23:31 +02:00
ocornut
1c8fad73f8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
 2025-05-07 15:24:46 +02:00
ocornut
46235e91f6 Examples: SDL3: specify SDL_WINDOW_HIGH_PIXEL_DENSITY and make centering consistent + call SDL_RenderScale(). 2025-05-05 20:04:32 +02:00
ocornut
e3bfaab3f7 Examples: update xcode projects. 2025-05-05 18:38:55 +02:00
ocornut
20066a8964 Examples: DirectX12+Win32: also test for IsIconic() for sleeping since we don't seem to get a DXGI_STATUS_OCCLUDED signal when minimized. (#8603) 
Amend ec1d2be96f. (#2496, #3907, #6308, #7615)
This technically prevents multi-viewports from working with io.ConfigViewportsNoDefaultParent=true but this is a more fringe case to handle for our example app, better tradeoff imho to use IsIconic().
 2025-04-30 11:30:06 +02:00
ocornut
87f12e56fe Backends: SDL_GPU: Added multi-viewport support. Amends + update example. (#8573, #8163, #7998, #7988) 2025-04-17 15:41:15 +02:00
ocornut
88d2df24be Merge branch 'master' into docking 2025-04-16 20:31:18 +02:00
ocornut
b23a216ecd Examples: added SDL2+Vulkan, SDL3+Vulkan, GLFW+Vulkan makefiles. Amend ignore list. (#2480) 2025-04-16 15:04:14 +02:00
ocornut
df5690d91a Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
 2025-03-30 16:42:28 +02:00
puugz
a806d2f9b8 Backends: SDLGPU: Fixed typo in function name Imgui_ImplSDLGPU3_PrepareDrawData() -> ImGui_ImplSDLGPU3_PrepareDrawData(). (#8509, 8163, #7998, #7988) 2025-03-21 20:16:56 +01:00
tanksdude
f5003aff69 Docs: Fix some typos (#8505) 2025-03-21 16:23:09 +01:00
ocornut
aa97252f60 Merge branch 'master' into docking 
# Conflicts:
#	imgui_internal.h
 2025-03-13 21:01:21 +01:00
ocornut
de4f77b0ac Backends: DX12: comment about using SrvDescriptorAllocFn/SrvDescriptorFreeFn. 
Amend 40b2286d16
 2025-03-12 15:47:37 +01:00
ocornut
09654f4e8c Revert "Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10." 
This reverts commit 6da230636b.
 2025-03-11 18:42:12 +01:00
ocornut
6da230636b Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10. 2025-03-11 12:25:19 +01:00
ocornut
19d060cc26 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2025-03-05 20:33:16 +01:00
ocornut
a7657f2ed4 Examples: SDL3: Added comments to clarify setup for users of the unfortunate SDL_MAIN_USE_CALLBACKS feature. (#8455) 2025-03-04 14:36:00 +01:00
ocornut
3fb14b50f8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
 2025-02-26 21:08:45 +01:00
ocornut
242d856ede Examples: SDL3+SDL_Renderer: removed reference to OpenGL to remove confusion. (#8434) 
Amend
 2025-02-26 14:40:41 +01:00
Russ Gibson
a86fcbd947 Examples: SDL3+SDL_Renderer: removed reference to OpenGL to remove confusion. (#8434) 2025-02-26 14:38:08 +01:00
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
1e18a6cf60 Examples: GLFW+Vulkan: make GLFW_DIR overridable in cmake bit. (#8419) 2025-02-21 16:55:35 +01:00
Tygyh
a6bcbb173b Examples: Android: Update kotlin version (#8409) 2025-02-20 18:07:25 +01:00
ocornut
afd659bb92 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_vulkan.cpp
 2025-02-17 11:46:16 +01:00
ocornut
12963f5231 Examples: Vulkan: make ApiVersion a little more visible in examples. (#8326, #8365) 2025-02-13 15:49:47 +01:00
ocornut
71d39a4634 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui_internal.h
 2025-02-12 19:17:48 +01:00
PuPuHX
3d900edba7 Examples: Win32+DirectX12: Fixed ExampleDescriptorHeapAllocator overflow free index. 
Amend 40b2286d1.
 2025-02-12 14:29:51 +01:00
ocornut
8679cfa2d8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
#	imgui.cpp
 2025-02-07 18:27:32 +01:00
fdsa
4f1d3809c3 Fixed tabs and spaces (#8377) 2025-02-06 19:54:43 +01:00
ocornut
11b3a7c8ca Merge branch 'master' into docking 2025-01-31 16:10:20 +01:00
Konstantin Podsvirov
e6c5296f30 Examples: SDL3: Fix for Emscripten platform (#8363) 2025-01-31 14:11:33 +01:00
ocornut
64e738cae7 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2025-01-22 12:19:09 +01:00
ocornut
d17e9fc107 Backends: SDL_GPU: shallow tweaks + disable anisotropy in sampler. Examples: SDL+Vulkan: Fixed incorrect defines. 2025-01-22 10:37:39 +01:00
ocornut
3e6bdc2242 Examples: SDL3+SDL_GPU: use SDL_GPU_PRESENTMODE_MAILBOX swapchain parameters. 2025-01-22 10:22:31 +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
ocornut
b4a5d1dc53 Backends: SDLGPU3: Rename GpuDevice->Device. Expose ImGui_ImplSDLGPU3_CreateDeviceObjects(), ImGui_ImplSDLGPU3_DestroyDeviceObjects(). Misc renaming. (#8163, #7998, #7988) 2025-01-16 12:43:06 +01:00
ocornut
015186aaf8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_vulkan.cpp
 2025-01-15 17:34:17 +01:00
ocornut
0f33d7185f Examples: Vulkan: vkAcquireNextImageKHR() and vkQueuePresentKHR() returning VK_SUBOPTIMAL_KHR keeps moving forward. (#7825, #7831) 2025-01-15 17:31:38 +01:00
ocornut
6684984c49 Examples: DirectX12: Reduced number of frame in flight from 3 to 2 in provided example, to reduce latency. 2025-01-15 15:13:05 +01:00
ocornut
d0d571e0d7 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_internal.h
 2025-01-13 14:30:57 +01:00
ocornut
0b8ff4b238 Backends, Examples: Vulkan: add IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE. use in descriptor pools sizes. (#6642) 2025-01-09 23:29:44 +01:00
ocornut
2f91176011 Merge branch 'master' into docking 2025-01-09 17:08:31 +01:00
ocornut
596e09770d Backends: SDL3: Added ImGui_ImplSDL3_InitForSDLGPU() for consistency. (#8163, #7998, #7988) 2025-01-09 17:07:53 +01:00
ocornut
e799849272 Backends: SDLGPU3: Added sdl_gpu backend (amends). (#8163, #7998, #7988) 2025-01-09 16:55:03 +01:00
Delta
8bbccf7a97 Backends: SDLGPU3: Added sdl_gpu backend. (#8163, #7998, #7988) 
+Squashed: Optimized shader source code encoding by ocornut (#8163, #7998, #7988)
(squashed to avoid storing both in git history, 130 KB->62 KB)
 2025-01-09 16:55:03 +01:00