Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,816 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '53baeee26a'
${ noResults }
Commit Graph

86 Commits (53baeee26a82eb478d417a8b596c302e3df1972f)

Author SHA1 Message Date
ocornut 5d472c4895 Merge branch 'master' into docking + fixes for #3259 
# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 5 years ago
ocornut bb2529dd48 Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends. 5 years ago
ocornut 05c3e0b898 Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 5 years ago
ocornut 0345324646 Backends: SDL: Fixed mapping for ImGuiKey_KeyPadEnter. (#3031) [@Davido71] 5 years ago
ocornut 7d80a8f4f5 Backends: Fix ImGui_ImplSDL2_InitForMetal() in docking branch. 5 years ago
Omar bb1e6f8af6 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
 5 years ago
Rokas Kupstys 21b9e42964 Minor fixes to example_sdl_metal and a changelog entry. 
Add example_sdl_metal to CI builds.

Closes #3017.
 5 years ago
coding_jackalope f346b4b302 Examples: SDL+Metal example. 5 years ago
omar 7e2d172ae5 Backends: GLFW, SDL: Platform monitors declared properly even if multi-viewport is not enabled. 5 years ago
Rokas Kupstys 7794b104c5 Backends: SDL/Viewports: Fix crash when SDL backend is used with DirectX graphics API and system does not support Vulkan. 
We must pass this flag only when we intend to render using vulkan backend.
 5 years ago
omar f5528001f6 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h
 5 years ago
omar f1b5c742ff Viewports: Add various comments 5 years ago
omar 8bcac7d95c Backends: GLFW, SDL: report Windows key (io.KeySuper) as always released. 
Neither GLFW nor SDL can correctly report the key release in every cases (e.g. when using Win+V) causing problems with some widgets. The next release of GLFW (3.4+) will have a fix for it. However since it is both difficult and discouraged to make use of this key for Windows application anyway, we just hide it. (#2976)
 5 years ago
omar 861f786d81 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 5 years ago
Rokas Kupstys f6951bb67d Viewports: SDL2: Honor NoTaskBarIcon flag under non Win32 OS. (#2117) 5 years ago
omar c706ff6f3a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 5 years ago
omar 0f7105e156 Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147) (#2800, 2802) 5 years ago
NeroBurner-tux 78ff147181 SDL: On wayland use SDL_GetMouseState (#2802) 
When the SDL Video backend is set to wayland the function
`SDL_GetGlobalMouseState` does not work. Most probably a security measure
for programs to not grab everything the user does
https://wiki.libsdl.org/SDL_GetGlobalMouseState

using SDL_GetMouseState https://wiki.libsdl.org/SDL_GetMouseState works
on wayland
 5 years ago
omar 992736dc5d Merge branch 'refs/heads/master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 5 years ago
omar 8342e5b91a Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4) 
Amend b5cad20d79, 945a509773
+ unrelated minor typos
 5 years ago
Rokas Kupstys 945a509773 Implement ImGuiMouseCursor_NotAllowed mouse cursor. 5 years ago
omar 7feccf9ab2 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	imgui.cpp
 5 years ago
omar 53278be61f FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey. 5 years ago
omar 575df6f192 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_internal.h
 5 years ago
omar 9cda3035fd Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 6 years ago
omar f0348ddffc Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. (#2677, #2005) 6 years ago
Aaron Cooper 0f86116a69 Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key. 6 years ago
omar adbbd17cb6 Addendum to #2635. Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. (#1542) 6 years ago
Vincent Hamm 3e8eebfbec Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. (#1542, #2635) 6 years ago
omar e2c1f0a7cd Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 6 years ago
Vincent Hamm cc4d76cc23 Implement SDL/dx11 sample 6 years ago
omar 431aa4e456 Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while. 6 years ago
omar dfb82d5c22 Merge branch 'master' into docking 
# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp
 6 years ago
omar 6789ea3482 Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484). 6 years ago
David Amador 994a92d79d Added support to use controllers via SDL_GameController. (#2509) 
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
 6 years ago
omar 882d480b5e Examples: Removed unused variable (will be used in docking branch tho, undo when merging!) 6 years ago
omar 9afb849e16 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
 6 years ago
omar cfa8f672f6 Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) (#2416) 6 years ago
omar 7f6a025c93 Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. (#2306) 6 years ago
omar f6fbb99a9c Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch. 6 years ago
omar 8079344cee Merge branch 'master' into viewport 
# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp
 6 years ago
omar 2c38b32db1 Removed trailing spaces (#2038, #2299) 6 years ago
omar 951c9dd68b Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
 6 years ago
omar d9a4cbc429 Examples: Comments about GLFW/SDL versions 6 years ago
omar a9a60a24c1 Tweaked asserts 6 years ago
omar 2889a14f86 Build fix for master. 6 years ago
omar 9d0bc3f9ab Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
 6 years ago
omar b1cd52b674 Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). (#421) 6 years ago
omar afe9c5c5f7 Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5. (#1542, #2117) 6 years ago
omar 8dd83c5fe8 Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. (#1542, #2117) 6 years ago