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
|
c6ca327fb2
|
Backends: Added more implicit asserts to detect invalid/redundant calls to Shutdown functions. (#4562)
|
2021-09-20 18:43:05 +02:00 |
|
ocornut
|
6bd447c885
|
Backends: GLFW: Fixed unused variable warning for empty assert macro. (#4459)
|
2021-08-22 18:46:49 +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 |
|
thedmd
|
2f40be638f
|
IO, Backends: add io.AddFocusEvent(). Clear pressed keys after loosing input focus (#3532)
Amend/fix #2445, #2696, #3751, #4377
|
2021-08-17 20:10:45 +02:00 |
|
ocornut
|
80b5fb51ed
|
Backends: Win32, SDL, GLFW: only honor io.WantSetMousePos when focused + fix GLFW uninstalling handler + tweaks to reduce branch drift with docking. (#787, #2445, #2696, #3751, #4377)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
|
2021-08-02 16:21:13 +02:00 |
|
ocornut
|
2ad912bb85
|
Backends: Win32, SDL, GLFW: only honor io.WantSetMousePos when focused + fix GLFW uninstalling handler + tweaks to reduce branch drift with docking. (#787, #2445, #2696, #3751, #4377)
|
2021-08-02 16:19:50 +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 |
|
ocornut
|
044fd0cd2d
|
Backends: GLFW: Mouse position is correctly reported when the host platform window is hovered but not focused. (#3751, #4377, #2445)
|
2021-07-29 19:37:18 +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 |
|
ocornut
|
baa4caf9e3
|
Backends: GLFW: Installing and exposed ImGui_ImplGlfw_MonitorCallback() for forward compatibility with docking branch.
+ Comments (#3934)
|
2021-07-07 14:12:48 +02:00 |
|
ocornut
|
cf2daf353e
|
Backends: Cleanup, removed unnecessary create/destroy wrappers. Fix allegro5 backend + use same code as other backend.
+ Update gallery links (#4280)
|
2021-06-30 15:50:15 +02:00 |
|
ocornut
|
23a15834fa
|
Fonts: Fix calling ClearTexData() (clearing CPU side font data) triggering an assert in NewFrame(). (#3487) + Backends: added additional assert to facilitate detecting user understand they haven't initialized a backend.
|
2021-06-29 18:16:47 +02:00 |
|
ocornut
|
4cec3a0467
|
Backends: support for multiple imgui context with little testing (#586, #1851, #2004, #3012, #3934, #4141)
I believe more renderer backends should work. GLFW/Win32/SDL/Vulkan probably have many issues.
|
2021-06-29 16:42:13 +02:00 |
|
ocornut
|
36a0d1028c
|
Backends: Viewports: renamed viewport storage structures ImGuiViewportDataXXXX -> ImGui_ImplXXXX_ViewportData and locals (matching naming convention in 70c60385)
|
2021-06-29 15:46:50 +02:00 |
|
ocornut
|
0f7eb00f67
|
Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys().
No need to clear fields before deletion. DX12: renamed to match docking branch.
|
2021-06-29 15:31:05 +02:00 |
|
ocornut
|
b5a2bd1a5b
|
Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys().
No need to clear fields before deletion. DX12: renamed to match docking branch.
|
2021-06-29 15:25:19 +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 |
|
ocornut
|
70c603854e
|
Backends: moved global to a data structure to facilitate support for multi-contexts. (#586, #1851, #2004, #3012, #3934, #4141)
This is NOT enable multi-contexts for any backends
- in order to make this commit as harmless as possible, while containing all the cruft/renaming
-
|
2021-06-29 14:37:58 +02:00 |
|
ocornut
|
95db098477
|
ImFontAtlas: move implicit AddFontDefault call to Build() function + remove unnecessary asserts in backend.
|
2021-06-25 17:27:17 +02:00 |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2021-06-04 17:28:45 +02:00 |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
2021-05-27 13:59:35 +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 |
|
ocornut
|
fd06dc511f
|
Backends: GLFW: Adding bound check in KeyCallback because GLFW appears to send -1 on some setups. [#4124]
|
2021-05-19 19:03:15 +02:00 |
|
Rokas Kupstys
|
a4adf60576
|
Backends, Viewports: GLFW: Add a workaround for stuck keys after closing a GLFW window (#3837).
|
2021-03-26 12:49:56 +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 |
|
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 |
|
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
|
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
|
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 |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
2021-01-15 19:20:42 +01: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
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
2020-10-14 14:41:40 +02:00 |
|