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

47 Commits (docking)

Author SHA1 Message Date
ocornut 377b864bb4 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 3 years ago
ocornut 1e18da5c38 Backends, Examples: Add comments about using WndProc handler and WantCaptureXXX flags. (#5061) 
+ update README.
 3 years ago
ocornut a11f36811f 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_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
 3 years ago
Giovanni Funchal 6792e1a3e0 Backends: SDL2: Remove unnecessary ImGui_ImplSDL2_NewFrame() parameter. (#3244) 3 years ago
ocornut a44d4da87c Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
 3 years ago
ocornut 020d1ced1d Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments. 3 years ago
ocornut 7fc144edde Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest. 3 years ago
ocornut 6ddcdbe3e8 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 4 years ago
ocornut 2403ed92a3 Added build/ to gitignore (#3027), Examples: SDL2: Link with shell32.lib required by SDL2main.lib since SDL 2.0.12. [#3988, #3884] + added batch file for SDL+Vulkan. 4 years ago
ocornut e7577d570e Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 4 years ago
ocornut 6f360d6040 Examples: Win32: using a more explicit loop for PeekMessage polling to make the code easier to copy and paste and less error-prone. 4 years ago
ocornut f1bf642e8f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis
 4 years ago
ocornut fdc2324d9a Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' 4 years ago
ocornut ffa863a3ba 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_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
 4 years ago
ocornut 6a161b8789 Examples: Reworked setup of clear color to be compatible with transparent values. (#2693, #2764, #2766, #2873, #3447, #3813, #3816) 4 years ago
ocornut 06e87014f2 Merge branch 'master' into docking 
# Conflicts:
#	imgui.h
#	imgui_internal.h
 4 years ago
ocornut 3346544cf5 Examples: Fix batch files (amend b1a18d82, #3513), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe. 4 years ago
ocornut dd4ca70b0d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
 4 years ago
omar 9c8671e7b0 Tables: Add empty file, skeleton. 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 a7e21fb05f Moving backends code from examples/ to backends/ (step 3: fixing project files) 4 years ago
ocornut 124c2608f1 Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency. 4 years ago
omar 209a6a751c Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)" 
This reverts commit a24578ec09.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
 4 years ago
omar a24578ec09 Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain) 4 years ago
ocornut 2665288b30 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 4 years ago
ocornut 40b799023b Docs: Update fonts.md (#2861) + update all references to FONTS.txt 4 years ago
ocornut ea0399414c Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 5 years ago
ocornut b016f1ad70 Examples: SDL+DX11: Fixed resizing main window. Amend (#3057) 5 years ago
joeslay a0f01d2290 Improve resizing in dx11 example (#3057) 
Make the dx11 example implementation resize the window in a sane way, i.e. not the stretching/scaling the initial render to fit the new window size (current behaviour).
 5 years ago
ocornut fbaf65b8f6 Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)" 
This reverts commit f2c7f3b200.
 5 years ago
ocornut f2c7f3b200 Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542) 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
omar e7bfcb970e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 5 years ago
omar 0a23582718 Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32. 5 years ago
omar 813e0c18e6 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_metal.h
#	examples/imgui_impl_metal.mm
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	examples/imgui_impl_vulkan.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 5 years ago
omar 26d177bc03 Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks 5 years ago
omar a704614b3e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 5 years ago
Rokas Kupstys c9182424a8 Normalize all the line endings. 
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
 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
Rokas Kupstys 6892b81578 Remove trailing spaces from bunch of files. 
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
 5 years ago
omar e0c0e53edf Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 5 years ago
omar a2f3dcfc97 Added comment about SDL and SDL_INIT_GAMECONTROLLER. (#2809) 5 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) 5 years ago
omar 516c3dee80 Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632) 5 years ago
Vincent Hamm cc4d76cc23 Implement SDL/dx11 sample 5 years ago