ocornut
1dc7d0e633
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
2022-09-26 11:08:49 +02:00
ocornut
5c8041b4d7
Update gif in README + font names in examples
2022-09-19 17:45:05 +02:00
ocornut
3af9ac320d
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
# imgui_demo.cpp
2022-09-17 00:25:42 +02:00
tocic
2b1d8e3eaf
Fix more typos in sources and docs ( #5681 )
2022-09-14 20:36:45 +02:00
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
stuartcarnie
6868d11669
Backends: OSX, Metal: Added multi-viewports support. ( #4821 , #2778 )
2022-05-03 18:14:07 +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
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
thedmd
ee436aa803
Backends: OSX: Update to use io.AddEventKey() will full key map ( #2625 , #1873 , #4858 )
2022-01-10 15:14:52 +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
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
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
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
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
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
