ocornut
21fc57f2cf
Merge branch 'master' into docking
2022-07-08 16:09:30 +02:00
ocornut
92d0924b82
Fixed build with IMGUI_DISABLE_OBSOLETE_KEYIO + made all examples comments refer to StyleColorsLight().
2022-07-06 20:58:20 +02:00
rokups
101aec95d9
Backends: SDL+GLFW, Examples: SDL+Metal, GLFW+Metal: Fix viewport support with Metal backend.
...
Fixes #5392 + alignment fixes and removed static_cast<> + Amended with fix.
2022-06-16 13:12:54 +02:00
omar
2fa60bec27
Examples: Apple+OpenGL: Fix build.
2022-05-09 11:30:52 +02:00
ocornut
d666a1d473
Backends: OSX, Metal: Amend d111133, tidying up, remove unused, misc tweaks. . ( #4821 , #2778 )
2022-05-03 18:14:10 +02:00
stuartcarnie
6868d11669
Backends: OSX, Metal: Added multi-viewports support. ( #4821 , #2778 )
2022-05-03 18:14:07 +02:00
ocornut
414165d23f
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# imgui.cpp
2022-05-03 14:40:17 +02:00
stuartcarnie
e66fc22057
Backends: OSX: Removed ImGui_ImplOSX_HandleEvent() from backend API. Move event tracking (desktop only) to OSX backend. ( #4821 )
...
Fix using NSKeyUp (#5268 ).
2022-05-03 14:35:08 +02:00
stuartcarnie
d58b8414b9
Backends: OSX, Metal: Tweaks. Use preferred method of obtaining a timestamp. ( #4821 )
...
+ Rename ImGuiFocusObserver. Docking branch will use it for more than focus.
2022-05-03 12:12:03 +02:00
ocornut
04689979b4
Examples: Emscripten+WebGPU: Fix for latest spec rename of WGPURenderPassColorAttachment::clearColor to ::clearValue ( #3632 )
2022-04-22 20:38:59 +02:00
ocornut
377b864bb4
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# imgui_internal.h
# imgui_widgets.cpp
2022-03-23 17:21:34 +01:00
ocornut
6fae29679a
Examples: Emscripten: Fix build. ( #3632 )
2022-03-15 18:36:41 +07:00
ocornut
1e18da5c38
Backends, Examples: Add comments about using WndProc handler and WantCaptureXXX flags. ( #5061 )
...
+ update README.
2022-02-28 20:51:50 +01:00
ocornut
9948535118
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2022-02-17 18:47:43 +01:00
ocornut
8d3906365d
CI: Fixes for OSX + explicitely request C++11.
2022-02-15 17:25:11 +01:00
ocornut
033538731c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
2022-02-07 16:18:19 +01:00
Clownacy
c6cab1f352
Backends: SDL: Added SDL_Renderer* parameter to ImGui_ImplSDL2_InitForSDLRenderer(). Use SDL_GetRendererOutputSize() instead of SDL_GL_GetDrawableSize() when bound to a SDL_Renderer. ( #4927 )
...
This is (kind of) an OpenGL-only function, which should be avoided when SDL2 isn't using OpenGL.
The only alternative that is recommended is SDL_GetRendererOutputSize, which limits this fix to the SDL_Renderer backend. Still, I think it's better than nothing.
I say that SDL_GL_GetDrawableSize is "kind of" OpenGL-only because it does technically work even when SDL2 isn't using OpenGL.
It's just that it becomes a shim to SDL_GetWindowSize, which is not suitable for high-DPI usage because it reflects the size of the window in screen coordinates, not actual pixels, so it really should be avoided when not using OpenGL.
2022-02-04 16:51:29 +01:00
ocornut
3e0d6ec895
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2022-01-21 12:39:15 +01:00
ocornut
ceb26bac48
Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. ( #914 )
2022-01-20 15:53:28 +01:00
ocornut
673f5e588d
IO: moved fields to put more focus on the new functions + update misc docs/references + update main.mm in Apple+Metal example ( #4858 )
2022-01-18 17:41:35 +01:00
ocornut
8567a4cca3
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui_demo.cpp
# imgui_internal.h
2022-01-17 18:19:20 +01:00
ocornut
6188e94108
Examples: Vulkan: fill Subpass and MSAASamples to increase discoverability ( #4886 ) + IO docs update ( #4858 )
...
https://github.com/mosra/magnum-integration/pull/89
2022-01-14 11:51:59 +01:00
ocornut
ef681e7019
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_sdl.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
2022-01-10 15:24:21 +01:00
thedmd
ee436aa803
Backends: OSX: Update to use io.AddEventKey() will full key map ( #2625 , #1873 , #4858 )
2022-01-10 15:14:52 +01:00
ocornut
15b4a064f9
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# examples/example_marmalade/main.cpp
# imgui.cpp
# imgui.h
2021-12-22 16:02:04 +01:00
ocornut
d9bc1e44af
Backends: Marmalade: Removed obsolete Marmalade backend (imgui_impl_marmalade.cpp) + example. ( #368 , #375 )
2021-12-20 19:29:41 +01:00
ocornut
cd36acc88b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# imgui.cpp
2021-12-15 12:10:03 +01:00
ocornut
d7350668d1
Fix OSX warnings + Examples/Apple+GL2 calls super reshape. ( #4759 , #1873 )
2021-12-13 12:31:15 +01:00
Stuart Carnie
1b6b8602c1
Backends: OSX: Fix keyboard support. Handle scroll cancel. Don't set mouse cursor shape unconditionally. ( #4759 , #4253 , #1873 )
...
Note the original FIXME: refered to GLFWs Cocoa implementation, which is largely what this commit provides.
2021-12-13 11:56:43 +01:00
Stuart Carnie
b720f1f03c
Backends: OSX: Add Game Controller support. ( #4759 )
2021-12-13 11:25:59 +01:00
ocornut
0b4edf4e94
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
2021-11-03 11:51:37 +01:00
liam
ad3f54ff1a
Examples: Emscripten comments ( #4650 , #4662 ), standardize readme
2021-10-19 14:17:12 +02:00
ocornut
835a5344b0
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2021-09-24 15:49:28 +02:00
ocornut
fba756176d
Backends: SDL_Renderer: Amend 1d2d246, various tweaks, fixes, sync to latest. ( #3926 )
2021-09-21 19:29:48 +02:00
Sylvain
62b17f928e
Backends: SDL_Renderer: Added renderer backend for SDL 2.0.17+ ( #3926 )
...
(Squashed 20 commits)
2021-09-21 19:29:48 +02:00
ocornut
dedb381c51
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
2021-08-30 20:01:16 +02:00
ocornut
11103f8253
Examples: SDL+OpenGL3: fixed build on ES2 target. ( #4492 )
2021-08-27 21:32:36 +02:00
ocornut
6afe9bbb45
Projects: added GLFW Vulkan to default solution.
2021-08-23 16:35:44 +02:00
ocornut
5a7d18a441
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2021-08-20 18:15:25 +02:00
ocornut
d2ffbd9b86
Version 1.84
...
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
2021-08-20 18:03:55 +02:00
ocornut
0b06c4b2b0
Merge branch 'master' into docking (will need further for io.AddFocusEvent)
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
2021-08-19 17:25:12 +02:00
ocornut
e3988a84db
Backends: OpenGL3: Embed our own minimal GL loader (amends). ( #4445 )
2021-08-19 16:24:59 +02:00
Rokas Kupstys
459de65477
Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. ( #4445 )
...
Loader repository at https://github.com/dearimgui/gl3w_stripped
Removed support for using custom loaders in examples/opengl3 backend
2021-08-19 16:24:58 +02:00
ocornut
f24abbc47d
Fix various warnings ( #4442 )
2021-08-18 12:38:24 +02:00
ocornut
f9b5168fb3
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
2021-08-02 16:00:50 +02:00
David Maas
923bd2fd21
Examples: DirectX12: Fixed Alt+Enter fullscreen in DirectX12 example. ( #4346 , #4348 )
...
This also removes unnecessary recreation of backend-owned device objects when the window is resized.
+ amend original PR with a g_pSwapChain->SetFullscreenState(false, NULL); call.
2021-07-26 16:39:09 +02:00
ocornut
a11f36811f
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_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
2021-07-09 20:16:19 +02:00
Giovanni Funchal
6792e1a3e0
Backends: SDL2: Remove unnecessary ImGui_ImplSDL2_NewFrame() parameter. ( #3244 )
2021-06-30 15:04:40 +02:00
ocornut
682447306d
Merge branch 'features/backends_context' 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_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# examples/example_apple_opengl2/main.mm
2021-06-29 14:53:25 +02:00
rokups
88f4c1321a
Examples: Bring code of example_apple_metal and example_apple_opengl2 closer to each other. ( #1873 , #3543 )
2021-06-28 14:22:55 +02:00
rokups
30224fdde0
Examples: example_apple_opengl2: Fix keys remaining stuck in pressed state when using shortcuts with CMD. ( #4253 )
...
Fix follows event capture scheme of example_apple_metal, where this issue is not present.
2021-06-25 11:34:12 +02:00
ocornut
a44d4da87c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
2021-06-08 18:38:51 +02:00
ocornut
020d1ced1d
Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.
2021-06-08 17:10:24 +02:00
ocornut
7fc144edde
Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.
2021-06-08 17:08:49 +02:00
ocornut
86c2b609ef
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
# imgui.cpp
2021-05-19 19:05:01 +02:00
Basil Fierz
83bdfef8e0
Backends: WGPU: update to latest specs. ( #4116 , #3632 )
...
Merged 13 commits.
2021-05-16 19:09:22 +02:00
ITotalJustice
ea9122b0ac
Examples: add backends include path in readmes. ( #4106 )
2021-05-07 15:12:09 +02:00
ocornut
34d4bc620d
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
2021-04-15 19:57:52 +02:00
duddel
05a20ca738
Examples: Android: Make Android build compatible with Gradle 7.0. ( #3446 )
2021-04-15 12:36:06 +02:00
ocornut
b957300260
Documentation tweaks ( #4042 )
2021-04-14 15:46:55 +02:00
Rokas Kupstys
bcdc8bcc4b
Examples: Vulkan: Update GPU selection to pick discrete GPU if available, or use first GPU otherwise. ( #4012 )
...
Fixes examples failing on optimus laptops with integrated graphics not supporting Vulkan.
2021-04-07 14:39:01 +02:00
Peter Kristensen
5f45047fb6
Update example makefiles to check the new homebrew paths ( #4003 )
...
Homebrew on Apple Silicon (i.e. Macbook Air/Pro M1) use `/opt/homebrew` instead of /usr/local.
2021-04-06 12:46:09 +02:00
ocornut
6ddcdbe3e8
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2021-03-31 16:41:17 +02:00
ocornut
2403ed92a3
Added build/ to gitignore ( #3027 ), Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [ #3988 , #3884 ] + added batch file for SDL+Vulkan.
2021-03-31 16:19:44 +02:00
Nikolai Wuttke
c6c15a44fa
Examples: Add OpenGL ES 2.0 support to modern GL examples. ( #2837 , #3951 )
2021-03-26 13:30:35 +01:00
ocornut
e7577d570e
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2021-03-25 16:57:01 +01:00
ocornut
6f360d6040
Examples: Win32: using a more explicit loop for PeekMessage polling to make the code easier to copy and paste and less error-prone.
2021-03-23 18:22:27 +01:00
ocornut
6e4770ea5c
Examples: Vulkan: Rebuild swapchain on VK_SUBOPTIMAL_KHR. ( #3881 )
...
Ref https://vulkan-tutorial.com/Drawing_a_triangle/Swap_chain_recreation#page_Suboptimal-or-out-of-date-swap-chain
2021-03-18 18:12:52 +01:00
ocornut
f1bf642e8f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
2021-03-11 16:32:14 +01:00
ocornut
fdc2324d9a
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
2021-03-11 16:21:46 +01:00
ocornut
80533ea5e1
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2021-03-05 16:04:15 +01:00
ocornut
8dd692c29c
Android: Amend backend and examples with minor consistency tweaks. ( #3446 )
2021-03-04 11:07:03 +01:00
duddel
fb85c0341b
Add Android backend and example ( #3446 )
2021-03-04 10:35:44 +01:00
ocornut
6aee4bcdc5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2021-03-02 18:27:07 +01:00
Xiliusha
eb57484935
Backends: DX9: add missing IMGUI_USE_BGRA_PACKED_COLOR support. Remove dinput.h headers. ( #3844 )
2021-03-02 15:04:34 +01:00
Rokas Kupstys
3f5bb5939a
Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. ( #2590 )
2021-02-24 17:18:53 +01:00
ocornut
9b32f7bf2d
Fix example_null Makefile for Mingw ( #2590 )
2021-02-22 14:44:06 +01:00
ocornut
a4e4f57cb0
Examples: DX9-DX11: Removed half-assed DPI awareness enable. Updated Docking/Viewports part of Changelog (e.g. removed bits that are now already in master, clarified some added bits)
2021-02-18 12:55:10 +01:00
ocornut
ffa863a3ba
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_opengl3.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
2021-02-18 11:41:27 +01:00
ocornut
6a161b8789
Examples: Reworked setup of clear color to be compatible with transparent values. ( #2693 , #2764 , #2766 , #2873 , #3447 , #3813 , #3816 )
2021-02-18 11:38:41 +01:00
ocornut
239d09804d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2021-02-10 21:28:16 +01:00
ocornut
647a308ad3
Backends: GLFW: Add ImGui_ImplGlfw_InitForOther() instead of ImGui_ImplGlfw_InitForWebGPU() so it can be used for e.g. DX11. ( #3632 )
...
Amend dff0044
2021-02-10 17:27:33 +01:00
ocornut
7a516a266d
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2021-02-09 13:17:24 +01:00
ocornut
b898281e3c
Demo: Added 'Examples->Fullscreen Window' demo. ( #3789 ) + repack and zero-clear ImDrawData.
2021-02-05 15:44:10 +01:00
ocornut
577e7cb493
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2021-01-28 21:02:13 +01:00
ocornut
dff0044d4e
Backends, Examples: Added support for WebGPU and corresponding example. Amend 5853fbd
( #3632 )
2021-01-28 15:40:31 +01:00
Basil Fierz
5853fbd68b
Backends, Examples: Added support for WebGPU and corresponding example ( #3632 )
...
(Squashed 11 commits)
2021-01-28 11:37:46 +01:00
ocornut
388ca563db
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
2021-01-15 19:20:42 +01:00
ocornut
feaa7ea003
Examples: Emscripten: Amend ba636c5. ( #3705 )
2021-01-11 18:46:23 +01:00
Horki
0f14dd9781
Examples: Emscripten: Add 'make serve' helper, move output to web/ folder. ( #3705 )
2021-01-11 18:46:23 +01:00
ocornut
b11518d7d7
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
2021-01-05 16:46:38 +01:00
ocornut
7d5d5711c2
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., ( #3671 , #3668 )
2021-01-03 17:01:54 +01:00
ocornut
8ec5daf35d
Happy new year!
2021-01-03 15:42:32 +01:00
ocornut
06e87014f2
Merge branch 'master' into docking
...
# Conflicts:
# imgui.h
# imgui_internal.h
2020-12-11 23:10:06 +01:00
ocornut
3346544cf5
Examples: Fix batch files (amend b1a18d82
, #3513 ), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe.
2020-12-09 18:28:02 +01:00
ocornut
dd4ca70b0d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
2020-12-04 19:22:15 +01:00
omar
9c8671e7b0
Tables: Add empty file, skeleton.
2020-12-04 19:15:19 +01:00
ocornut
c1ffac2fee
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2020-12-03 20:05:49 +01:00
ocornut
d20f2bc90a
Rename example_emscripten/ to example_emscripten_opengl3/ ( #3632 )
2020-12-02 11:23:56 +01:00
ocornut
b2a91dc390
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-11-13 22:04:28 +01:00
Rokas Kupstys
a3f79104df
Examples: Apple+Metal: Forward events to OS key combinations like CMD+Q can work. ( #3554 )
2020-11-11 15:30:08 +01:00
ocornut
ac08593b96
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-11-05 21:36:22 +01:00
ocornut
5f97809cab
Misc tidying up (zero-clear structures, more unused default in ClipRetFullscreen, NavApplyItemToResult() coding style fix)
...
Zero-clearing more structures
Remove arbitrary default ClipRetFullscreen value in ImDrawListSharedData.
Nav extracted NavApplyItemToResult() function.
Coding style fixes in OSX Backends.
2020-11-05 13:24:27 +01:00
ocornut
e3ac52630a
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
2020-10-31 00:47:57 +01:00
Warren Moore
bca4749346
Examples: Apple: Consolidated example_apple_metal to reduce class and file count ( #1873 , #3543 )
2020-10-23 11:33:08 +02:00
Bill Six
acb8ef2006
Examples: Vulkan: Fixed CMake include path. ( #3550 )
...
The backends directory was not included, so the build was failing.
2020-10-21 09:13:54 +02:00
ocornut
042a3b01d2
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2020-10-14 14:44:03 +02:00
ocornut
b1a18d82e3
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
2020-10-14 14:42:00 +02:00
ocornut
a2a3d80f04
Moving backends code from examples/ to backends/ (step 5: move documentation to MD files)
2020-10-14 14:41:40 +02:00
ocornut
a2d845f9dd
Moving backends code from examples/ to backends/ (step 4: update documentation, much improvement)
2020-10-14 14:41:40 +02:00
ocornut
a7e21fb05f
Moving backends code from examples/ to backends/ (step 3: fixing project files)
2020-10-14 14:41:40 +02:00
ocornut
428f4fce70
Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)
2020-10-14 14:41:40 +02:00
ocornut
d9b2fb7338
Moving backends code from examples/ to backends/ (step 1: moving source files)
2020-10-14 14:41:40 +02:00
ocornut
124c2608f1
Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.
2020-10-12 17:54:52 +02:00
ocornut
0f13fdd177
Removed redirecting functions/enums names that were marked obsolete in 1.60: io.RenderDrawListsFn, IsAnyWindowFocused(), IsAnyWindowHovered(), etc.
2020-10-12 13:17:05 +02:00
ocornut
04de5ef819
Version 1.80 WIP
2020-10-12 13:04:34 +02:00
ocornut
682249396f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-10-08 16:05:55 +02:00
ocornut
e5cb04b132
Version 1.79
...
+ Update readme and mission statement.
Removed "Minimize screen reel-estate usage", removed details on memory consumption (still very valid, just too much noise in a mission statement)
2020-10-08 16:01:59 +02:00
ocornut
7b1ab5b275
ImVector: Stricter bound-checking asserts. Fix warnings: trailing comma (old compilers), zealous preprocessor warnings.
2020-10-01 14:48:19 +02:00
ocornut
958e58b06b
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_apple_opengl2/main.mm
# imgui.cpp
2020-10-01 13:33:08 +02:00
ocornut
179dc04d8a
Examples: Added missing comments in example_apple_metal. ( #3400 )
2020-09-30 14:55:09 +02:00
ocornut
fa004ae79a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_examples.sln
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
# imgui_widgets.cpp
2020-09-22 17:00:57 +02:00
ocornut
825f699bde
Backends: OpenGL3: Amends ( #3467 , #1985 )
2020-09-17 09:55:58 +02:00
Sven Balzer
42575d4a99
Viewports, Backends: Win32: Fix toggling of ImGuiViewportFlags_TopMost ( #3477 )
2020-09-17 09:47:04 +02:00
Julian Webb
2460f2abe3
Backends: OpenGL3: Fix to avoid calling glBindSampler() with version <= 3.2 ( #3467 , #1985 )
...
(nb: GLEW sets the define we previously used)
2020-09-17 09:34:11 +02:00
omar
e230ec5a01
Viewports, Backends: DX12: Make secondary viewport format match main viewport one ( #3462 ) {@BeastLe9enD]
2020-09-16 11:05:02 +02:00
Pierre-Loup Pagniez
a1597cff08
Backends: DX12: Fix D3D12 Debug Layer warning if scissor rect is 0 width or 0 height. ( #3472 , #3462 )
...
In the event where the scissor rect is 0 width or 0 height, don't call Draw, as it generates warnings if the D3D12 Debug Layer is enabled, and nothing would have been drawn anyway.
2020-09-16 10:43:17 +02:00
omar
a8f409a848
Examples: DX12: Enable breaking on any warning/error when debug interface is enabled. ( #3462 , #3472 ) + misc comments & minor fixes.
2020-09-16 10:40:06 +02:00
omar
770c995365
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2
. ( #3459 ) + Add ImGui_ImplVulkanH_CreateWindowSwapChain in ImGui_ImplVulkanH_CreateOrResizeWindow().
2020-09-08 22:44:24 +02:00
omar
e8447dea45
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2
. ( #3459 )
2020-09-08 22:39:53 +02:00
omar
d8d58b038e
Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. ( #301 )
2020-09-08 20:03:34 +02:00
omar
78f753ffff
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code ( #3455 , #3459 )
2020-09-08 17:02:58 +02:00
Michel Lesoinne
41e2aa2e7a
Backends: Vulkan: Separate the pipeline of the dear imgui created windows from the one created with the user's render-pass. ( #3455 , #3459 )
...
This is mostly for the benefit of multi-viewports.
2020-09-08 16:54:48 +02:00
omar
6461fd40ab
Examples: Fixed SDL+OpenGL2 and SDL+Vulkan examples not processing SDL_WINDOWEVENT_CLOSE events which tends to be needed in multi-viewport setting.
2020-09-07 12:23:26 +02:00
Michel Lesoinne
b25756be4a
Examples: Vulkan: Switch validation layer. Fix CMakeLists to find Vulkan the standard way. ( #3459 )
2020-09-07 11:43:57 +02:00
Doug Binks
aa8e09d7f1
Backends: GLFW: workaround for cases where glfwGetMonitorWorkarea fails ( #3457 )
2020-09-07 10:49:34 +02:00
ocornut
36c331ff74
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
# imgui_internal.h
2020-09-02 12:47:07 +02:00
ocornut
b73305be11
Examples: Vulkan: Reworked buffer resize handling, amend df89a16d
( #3390 , #2626 )
2020-09-02 12:43:23 +02:00
ocornut
e9053515bb
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
2020-08-25 19:29:06 +02:00
ocornut
df89a16d26
Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. ( #3390 , #2626 )
2020-08-21 15:29:57 +02:00
ocornut
d6f3a8848d
Viewports: Backends: DirectX9: Allow D3DERR_DEVICELOST on secondary viewports. ( #3424 )
2020-08-21 15:02:52 +02:00
ocornut
ad8fdc917f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-08-20 22:42:14 +02:00
ocornut
9262609eaf
Version 1.79 WIP
2020-08-20 16:46:44 +02:00
ocornut
024993adf9
Revert leftovers from 4c201994d4
2020-08-20 11:25:05 +02:00
ocornut
4c201994d4
DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. ( #3361 )
2020-08-20 11:21:15 +02:00
ocornut
05bc204dbd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
2020-08-18 17:51:43 +02:00
ocornut
95c99aaa4b
Version 1.78
2020-08-18 17:50:45 +02:00
omar
14539b3ed2
Update Emscripten readme about emrun ( #3412 )
2020-08-18 12:34:19 +02:00
omar
d3fcc37e9e
Update Emscripten readme about local XHR requests ( #3412 )
2020-08-18 12:27:40 +02:00
ocornut
25a9209b75
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2020-08-17 23:29:17 +02:00
omar
009276b6cb
Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads ( #3394 , #2424 , #1463 ) [@nobody-special666]
...
Amend 7dea158175
+ Fix vsproj GUID
2020-08-10 15:31:48 +02:00
omar
2c13a74a9d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
2020-08-10 11:35:51 +02:00
omar
209a6a751c
Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
...
This reverts commit a24578ec09
.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
2020-08-10 11:33:59 +02:00
ocornut
ede8825fb2
Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833
( #3390 )
2020-08-07 15:24:00 +02:00
omar
a24578ec09
Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)
2020-08-05 15:02:30 +02:00
omar
963839373c
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
2020-08-03 21:31:42 +02:00
Rokas Kupstys
3d4af15d1d
Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available.
2020-07-17 18:44:09 +02:00
omar
cba52b66af
Backends: GLFW: Fixed enabling ImGuiBackendFlags_HasMouseHoveredViewport broken by 950539b7
.
...
As it turns out, back-end passing NULL hovered with HasMouseHoveredViewport is also broken which defeats some of its purpose.
2020-07-17 18:14:04 +02:00
omar
f79f0e42f7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
2020-07-14 18:38:47 +02:00
omar
fb7f6cab8c
Backends: Amend, docs + extra comments. ( #3330 , #3245 )
2020-07-10 14:36:00 +02:00
Moritz Heinemann
06f7854b16
Backends: OpenGL3: Add glad 2 to OpenGL loaders. ( #3330 )
2020-07-10 14:34:25 +02:00
omar
b626dd57d3
Backends: DX12, Viewports: Tidying up, renaming.
2020-07-10 12:20:03 +02:00
omar
cb1d578470
Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. ( #3347 )
2020-07-10 12:09:24 +02:00
omar
ab4ef822f0
Version 1.78 WIP
2020-06-30 16:56:09 +02:00
omar
90ea7e2f2f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-06-30 16:43:16 +02:00
Rokas Kupstys
0738611559
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
2020-06-30 16:37:21 +02:00
omar
ddabfc3477
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2020-06-29 17:15:40 +02:00
omar
9418dcb693
Version 1.77
...
+ fix minor clang-tidy warnings which seems reasonable
2020-06-29 15:54:28 +02:00
omar
20d61f5f62
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-20 22:06:01 +02:00
omar
99f68d7958
Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
2020-06-19 11:34:04 +02:00
ocornut
2665288b30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-11 11:36:38 +02:00
ocornut
40b799023b
Docs: Update fonts.md ( #2861 ) + update all references to FONTS.txt
2020-06-09 16:56:48 +02:00
ocornut
8baa4ccff5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2020-06-06 20:31:24 +02:00
Rokas Kupstys
5af8a8c7e8
CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings.
2020-06-05 15:50:12 +02:00
Rokas Kupstys
dc49b14e29
Misc: Fix examples of using other OpenGL3 bindings in Makefiles.
2020-06-05 14:05:39 +02:00
Mark Jansen
6eb66fbef3
Backends: Win32: Cache the result of a windows version check. ( #3283 )
...
This is not expected to change while the application is running :)
2020-06-05 01:23:18 +02:00
Giovanni Funchal
3f26a07ee1
Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. ( #3246 )
2020-05-25 18:57:23 +02:00
ocornut
5d472c4895
Merge branch 'master' into docking + fixes for #3259
...
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2020-05-25 18:32:15 +02:00
ocornut
a06eb83359
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. ( #3259 )
2020-05-25 18:15:59 +02:00
ocornut
bb2529dd48
Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends.
2020-05-25 12:26:59 +02:00
ocornut
a056603d8b
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
2020-05-25 12:12:02 +02:00
ocornut
9c209d5a90
Minor amend 9028088 ( #3261 )
2020-05-25 11:42:45 +02:00
Nicolas Burrus
43f79aa210
Backends: OSX: import the glfw workaround to avoid missing mouse clicks. ( #3261 )
2020-05-25 11:42:45 +02:00
Nicolas Burrus
39d17ca07f
Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. ( #3260 )
2020-05-25 11:29:41 +02:00
Espyo
f44962c01a
Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. ( #3252 )
2020-05-20 17:48:21 +02:00
omar
75bbbda645
Examples: Update comments to get SDL2 package with msys2's pacman ( #3251 )
2020-05-20 11:44:00 +02:00
omar
e4d8267188
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-05-16 14:14:51 +02:00
Chris Savoie
03ea87ea28
Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings.
2020-05-11 19:31:35 +02:00
Albert Vaca
685ca27d84
Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. ( #3199 )
2020-05-08 17:32:34 +02:00
Ivan Zinkevich
1e7672acf4
Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. ( #3210 )
...
Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean.
2020-05-08 17:26:46 +02:00
omar
582f4db59b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2020-05-07 22:13:47 +02:00
omar
11a3e75f47
Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). ( #3183 )
2020-05-04 20:46:20 +02:00
omar
5116eee108
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2020-05-04 15:05:07 +02:00
omar
099091280f
Backends: DX10/DX11: Minor tweaks.
2020-05-04 11:40:31 +02:00
Silent
1e9abf60d1
Backends: Keep shader blobs as local variables. ( #3176 )
2020-05-04 11:22:43 +02:00
omar
d5ce3b43ae
Backends: Vulkan: Fixed error in if initial frame has no vertices. ( #3177 )
2020-05-04 11:03:41 +02:00
Chris Savoie
73c30aa085
Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed.
2020-04-26 20:26:06 +02:00
Matt Haynie
d3212482fe
Fix multiple macro definitions of GLFW_INCLUDE_NONE ( #3157 )
2020-04-23 22:58:45 +02:00
u3shit
528b12eb7a
Fix glClipControl(GL_UPPER_LEFT) handling in opengl3.
2020-04-22 10:10:51 +02:00
ocornut
266dff9bed
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
2020-04-20 11:33:56 +02:00