ocornut
3552df562e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2024-07-25 16:41:56 +02:00
chenqiudu
aa0f6b37bd
Backends: OSX: fixed NSAppKitVersion version limit for setWantsBestResolutionOpenGLSurface usage. ( #7814 )
2024-07-23 15:20:38 +02:00
Cyao
fe09ebbe0a
Backends: OpenGL3: Fixed unsupported option warning with apple clang ( #7810 )
2024-07-22 21:10:35 +02:00
ocornut
271910e349
Backends: SDL3: Update for API changes: SDL_GetDisplays() memory ownership change. ( #7809 )
2024-07-22 19:43:59 +02:00
ocornut
3fab2bb7be
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
2024-07-22 19:41:39 +02:00
ocornut
eb72b5a8ee
Backends: SDL3: Update for API changes: SDL_GetGamepads() memory ownership change. ( #7807 )
2024-07-22 10:49:22 +02:00
ocornut
0e485a2109
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_widgets.cpp
2024-07-18 17:56:27 +02:00
ocornut
c2d21ab04f
Backends: SDL3: Update for API changes: SDL_GetClipboardText() string ownership change. ( #7801 )
2024-07-18 14:02:27 +02:00
ocornut
5ea96c15cd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_win32.cpp
2024-07-15 11:21:18 +02:00
ocornut
9c2f6003e4
Backends: SDL3: fixed typo leading to PlatformHandleRaw not being set leading to SHOWNA path not working for multi-viewports.
2024-07-15 11:17:21 +02:00
wermi
df3a74389e
Backends: SDL3: Update for API changes: SDL_GetProperty() change to SDL_GetPointerProperty(). ( #7794 )
2024-07-15 11:16:26 +02:00
ocornut
a8e96ae21a
Backends: GLFW+Emscripten: Fixed build ( #7647 )
2024-07-08 22:26:14 +02:00
Yan Pujante
2937339c17
Backends: GLFW+Emscripten: Added support for GLFW3 contrib port. ( #7647 )
2024-07-08 22:06:24 +02:00
Yan Pujante
6816789a6b
Backends: GLFW+Emscripten: (Breaking) Renamed ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback() to ImGui_ImplGlfw_InstallEmscriptenCallbacks(), added GLFWwindow* parameter. ( #7647 , #7600 )
...
+ Fixed Emscripten warning when using mouse wheel on some setups.
2024-07-08 22:02:48 +02:00
Aemony
9504068f66
Backends: Win32: fixed ImGuiMod_Super being mapped to VK_APPS instead of VK_LWIN||VK_RWIN ( #7768 , #4858 , #2622 )
...
Amend 075576744https://conemu.github.io/en/AppsKey.html
This means that when using `ImGui::GetIO().KeySuper` to try to get the down state of the `VK_RWIN` or `VK_LWIN` keys, it'll always return FALSE when either of those keys are held down, and only return TRUE when `VK_APPS` is held down.
2024-07-08 13:59:07 +02:00
ocornut
527b2c45af
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
2024-07-02 19:05:36 +02:00
ocornut
0ebf49b4c1
IO: amend PlatformOpenInShellFn specs to return a bool. ( #7660 )
...
Amend 8f36798
2024-07-02 19:03:40 +02:00
ocornut
380b3559c6
Backends: GLFW,SDL2: Added ioPlatformOpenInShellFn handler for web/Emscripten versions. ( #7660 )
2024-07-02 18:06:19 +02:00
ocornut
3f61da7e8b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
2024-07-02 17:48:38 +02:00
ocornut
fb799bba7f
(Breaking) IO, IME: renamed platform IME hook io.SetPlatformImeDataFn() -> io.PlatformSetImeDataFn() and added explicit context.
2024-07-02 15:48:32 +02:00
ocornut
ae708e3bcd
Backends: SDL3: add default case to fix warnings. ( #7763 )
2024-07-02 12:12:25 +02:00
ocornut
a489585f84
Backends: SDL3: Updated comments (IME seems fixed in SDL3). Added SDL3 examples to Visual Studio solution.
2024-07-02 11:37:18 +02:00
ocornut
12f92518bc
Backends: SDL3: Update for API changes: SDLK_x renames and SDLK_KP_x removals ( #7761 , #7762 )
...
Also updated function signature in SDL2 backend to match and because it is expected we will use that data (as per #7672 )
2024-07-02 11:36:13 +02:00
ocornut
3369cbd277
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
2024-07-01 17:10:12 +02:00
Max Ortner
ccf3ee674a
Backends: SDL3: update for SDL_SetTextInputRect() -> SDL_SetTextInputArea() api change. ( #7760 , #7754 )
2024-07-01 12:10:00 +02:00
ocornut
751bbf38ba
Backends: SDLRenderer3: Update for SDL_RenderGeometryRaw() API changes.
2024-07-01 12:07:59 +02:00
Connor Clark
f2c07ed717
Backends: Allegro5: Correctly handle unstable bit in version checks ( #7755 )
2024-06-30 23:25:51 +02:00
ocornut
138d9d0c21
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
2024-06-28 16:03:49 +02:00
ocornut
c7df9c7121
Backends: Win32: Fixed warning with old MinGW/GCC versions.
2024-06-28 15:48:08 +02:00
ocornut
404af57004
Backends: OpenGL2, OpenGL3: ImGui_ImplOpenGL3_NewFrame() recreates font texture if it has been destroyed by ImGui_ImplOpenGL3_DestroyFontsTexture(). ( #7748 )
...
Analogous to change to Vulkan backend in 1.90.
2024-06-28 15:08:54 +02:00
ocornut
0c2650e833
Backends: OSX: build fix. Amend 32f9dfc
2024-06-26 16:23:42 +02:00
ocornut
10a5a857f5
Merge branch 'master' into docking
...
# 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
# imgui.h
2024-06-26 14:54:01 +02:00
ocornut
7c2476986b
Backends: SDL3: Update for SDL_StartTextInput()/SDL_StopTextInput() API changes. ( #7735 )
2024-06-26 14:45:25 +02:00
ocornut
32f9dfc126
Viewports: Backported 'void* ImGuiViewport::PlatformHandle' from docking branch for use by backends.
2024-06-26 14:32:48 +02:00
Martin Ejdestig
a18fb406ac
Backends: Vulkan: Remove Volk/ from volk.h #include directives ( #7722 , #6582 , #4854 )
2024-06-24 13:09:00 -07:00
Gary Geng
48e7e7bfe8
Backends: SDL3: Follow SDL3 removal of keysym field in SDL_KeyboardEvent ( #7729 )
2024-06-23 15:26:52 -07:00
ocornut
e863f89d39
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-06-20 17:47:22 -07:00
ocornut
416cfdb99d
Backends: Win32: Secondary viewports WndProc handler retrieve/set imgui context from the HWND.
...
Allowing WndProc dispatch to work in multi-context setups.
2024-06-20 17:44:19 -07:00
ocornut
3acb869a95
Backends: Win32: avoid skipping DefWindowProc() on WM_CLOSE.
...
Mostly because I don't have a trace of why I did it this way, even in viewport branch history.
2024-06-20 17:42:46 -07:00
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
5ecef2f321
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
2024-05-23 17:25:02 +02:00
Michal Šlesár
4c3eac2c10
Backends: OpenGL3: Fixed zealous warning by initializing last_pixel_unpack_buffer. ( #7614 )
2024-05-22 12:01:54 +02:00
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
