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
|
3 years ago |
|
ocornut
|
790132a672
|
Added io.AddKeyModEvent() and updated backends accordingly. (#2625, #4858)
|
3 years ago |
thedmd
|
ee436aa803
|
Backends: OSX: Update to use io.AddEventKey() will full key map (#2625, #1873, #4858)
|
3 years ago |
|
ocornut
|
afffcd5810
|
Inputs: rename ImGuiKey_KeyPadEnter > ImGuiKey_KeypadEnter (#2625)
|
3 years ago |
|
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
|
3 years ago |
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.
|
3 years ago |
|
Stuart Carnie
|
b720f1f03c
|
Backends: OSX: Add Game Controller support. (#4759)
|
3 years ago |
|
ocornut
|
835a5344b0
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
3 years ago |
James McCartney
|
bc3d267c51
|
Backends: OSX: Use mach_absolute_time as CFAbsoluteTimeGetCurrent can jump backwards. (#4557, #4563)
|
3 years ago |
|
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
|
3 years ago |
|
thedmd
|
2f40be638f
|
IO, Backends: add io.AddFocusEvent(). Clear pressed keys after loosing input focus (#3532)
Amend/fix #2445, #2696, #3751, #4377
|
3 years ago |
|
ocornut
|
ac35b4bba2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
4 years ago |
Rokas Kupstys
|
0b8a247074
|
Backends: OSX: Added a fix for shortcuts using CTRL key instead of CMD key. (#4253)
|
4 years ago |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
4 years ago |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
4 years ago |
|
ocornut
|
33cdbe97b8
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
4 years ago |
|
rokups
|
6d53884487
|
Backends: OSX: Fix keys remaining stuck in pressed state when CMD-tabbing to a different application. (#3832)
|
4 years ago |
|
ocornut
|
577e7cb493
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
4 years ago |
|
Rokas Kupstys
|
066406b9be
|
Backends: OSX: Fix mouse position not being reported when mouse buttons other than left one are down. (#3762)
# Conflicts:
# docs/CHANGELOG.txt
|
4 years ago |
|
ocornut
|
ac08593b96
|
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
4 years ago |
Albin Odervall
|
b934b9bb86
|
Backends: OSX, Metal: Fix -Wshadow, -Wimplicit-float-conversion, and -Wsign-conversion warnings. (#3555)
|
4 years ago |
|
ocornut
|
e3ac52630a
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
4 years ago |
|
Rokas Kupstys
|
6f57d58e82
|
Backends: OSX: Fix KeyPadEnter on MacOS. (#3554)
|
4 years ago |
|
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
|
4 years ago |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
4 years ago |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
4 years ago |