bcsanches
64a82d73c9
Backends: SDL3: Update for introduction of SDL_GLContext from void*. ( #7701 , #7702 )
2024-06-18 09:45:24 -07:00
ocornut
fdc084f532
Merge branch 'master' into docking
2024-06-03 19:08:37 +02:00
ocornut
f8de9fec8c
Backends: SDL3: Update for SDL_SYSTEM_CURSOR_xxx api renames. ( #7653 )
2024-06-03 18:25:58 +02:00
ocornut
b39fc84f89
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-05-16 19:57:04 +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
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
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
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
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
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
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
fd8d6dc5d1
Backends: SDL2,SDL3: tidying up.
2024-02-13 15:49:49 +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
c6ec69c7c1
Using nullptr in remaining examples/backends locations. ( #6313 , #7071 , #4537 )
2023-11-28 19:29:17 +01:00
ocornut
3733b5064e
Backends: SDL3: Fixed unused variable warning on master on some targets. ( #7000 )
2023-11-17 12:28:25 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Bruno Perković
5320a6ebd3
Backends: Made SDL3 backend compatible with commit 698dbd8. ( #6255 , #6146 )
2023-03-21 12:17:54 +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
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
ea4565368e
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
2023-02-10 17:05:06 +01:00
ocornut
0d7d877cb5
Backends: SDL3: Update for latest.
...
Note that resizing secondary viewports seems broken.
2023-02-10 14:45:52 +01:00
ocornut
fac19e1883
Backends: SDL2:+SDL3 Implement SetPlatformImeDataFn (amends). ( #6071 , #1953 ) + fix SDL3 setting PlatformHandleRaw. ( #6146 )
2023-02-07 19:29:44 +01:00
ocornut
95412ad3a5
Backends: SDL3: Removed unnecessary #ifdef.
2023-02-07 17:09:51 +01:00
ocornut
a526ff8c30
Backends: SDL3: Added multi-viewports support. ( #6146 )
2023-02-07 16:30:58 +01:00
ocornut
13fbd99491
Backends: SDL3: update to run with SDL3. Examples: Add SDL3+Gl example. Remove some version checks. ( #6146 )
...
More update upcoming in docking branch.
2023-02-07 16:07:53 +01:00
ocornut
d9bf80f655
Backends: SDL3: copied imgui_impl_sdl2 into imgui_impl_sdl3 and ONLY replaced strings (1/2). ( #6146 )
...
NO OTHER CHANGES. This WILL NOT compile with SDL3.
This intermediate commit designed to make it easier to visualize the meaningful channges commit in the next commit.
2023-02-07 13:32:38 +01:00
