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

1173 Commits (6024051a2fcfc75d640ba5ed1660bc607ad49937)

Author SHA1 Message Date
omar b3e94f5de8 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
 5 years ago
omar f002a11898 Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. (#2866, #2852) [@dpilawa] 5 years ago
dawid 4d0c88e9e6 Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. (#2866, #2852) 5 years ago
omar 0cbb96895a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
 5 years ago
Funto 75d540d336 Example: Emscripten: Fix for compilation (filesystem module is required) (#2734) 5 years ago
omar 048b73dfaa Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code. 5 years ago
omar 7b77cb3bb8 Backend: DX12: Fixed incorrect assert (#2851) 5 years ago
omar 6ffee0e75e Backends: DX12: Added extra ID3D12DescriptorHeap parameter to ImGui_ImplDX12_Init() function. The value is unused in master branch but will be used by the multi-viewport features (docking branch). (#2851) 
+ Using SafeRelease() in master.
 5 years ago
omar 6faad0c34f Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. (#2851) 
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
 5 years ago
Ilya.Sevrikov 05c1f2795a Add multi-viewports for DX12. (#2851) 
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
 5 years ago
omar eedc8f993f Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled. 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
malte-v 4de32cc87e Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down (#2836) 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 3bbc27ebd9 Fixed more FAQ links. (#2848) 5 years ago
Rokas Kupstys 9d6b2b096b Ignore directories created by JetBrains IDEs. 
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
 5 years ago
Rokas Kupstys 6892b81578 Remove trailing spaces from bunch of files. 
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
 5 years ago
omar fc10ba8d24 Amend f0238ece9cba67ecabef438008fea53682bd6bc7 (#2817, #2818) 5 years ago
Egor Yusov 378035c6ff Fixed backspace handling on MacOS (fixed https://github.com/ocornut/imgui/issues/2817). 
Allow null view passing as parameter to ImGui_ImplOSX_NewFrame
 5 years ago
omar bf4880f6a2 Merge branch 'master' into docking 5 years ago
Harris Brakmic 323412dd23 Examples: Allegro5: updated build instructions for macOS 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 c262276988 Version 1.74 WIP 5 years ago
Konstantin Podsvirov f0f5301612 Backends: OpenGL3: Commented out extra tokens at end of #else directive (#2804) 5 years ago
omar 6994bf10bc Merge branch 'master' into docking + fix for RenderMouseCursor() 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_internal.h
 5 years ago
omar d5efe16157 Version 1.73 5 years ago
omar 97691643b7 Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3 (#2798) 5 years ago
osheriff 44cd8e39da Automatically include the available gl loader header 5 years ago
omar 3233d85d2f Merge branch 'master' into docking 5 years ago
omar f7468d05fe Fixed mouse event forwarding in macos example (#2710, #1961) 5 years ago
omar cf98290873 Backends: DirectX9: Workaround for windows not refreshing when main viewport has no draw call. (#2560) 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
NeroBurner e7e88ed413 Examples: SDL/GLFW + OpenGL3: Fixes for Makefile (#2774) 
- append CXXFLAGS instead of overwriting them
- add glad.c build rule
 5 years ago
omar cc288e073c Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted. 5 years ago
omar a4af3cc814 Viewport, GLFW: Fix for #2756 under Windows. 5 years ago
Rokas Kupstys a89a3cd2f1 Viewports, GLFW: Fix window having incorrect size after uncollapse. Issue manifests on Linux when window is in it's own viewport. (#2756, #2117) 5 years ago
Rokas Kupstys 09780b8b3d Viewport: Fix setting window size on macos (glfw). (#2767, #2117) 
MacOS positions windows by their bottom-left corner why the rest of the world (including imgui) position windows by the top-left corner. This created an issue where collapsing imgui window would cause window header to remain at the bottom the full window rect. Likewise resizing window by using sizing handle caused window to grow upwards when we tried to expand window downwards.

This workaround moves window to the opposite direction by the delta of size change creating an illusion that windows are positioned by their top-left corner.
 5 years ago
omar e1fca8d982 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 5 years ago
omar a856c670c1 TabBar: fixed single-tab not shrinking their width down. 
+ minor typo fixes (#2738)
 5 years ago
omar aedcd2fb1a Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx11.cpp
#	imgui.cpp
 5 years ago
Matthias Moulin 2e756d5b47 Explicit narrowing cast from size_t to UINT (#2726) 
Clang: `non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long long') to 'UINT' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]`
 5 years ago
Vilya Harvey 62143dff64 Backends: Vulkan: Added support for specifying multisample count. (#2705, #2706) 5 years ago
omar 6cf4743f17 Backends: DX11: Fixed GSGetShader() call not passing an initialized instance count, would generally make the debug layer complain (Added in 1.72). 5 years ago
omar f624455d7b Version 1.73 WIP 5 years ago
omar b8d8355f10 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 5 years ago
omar 6a0d0dab5a Version 1.72b (patch for nav) 5 years ago
omar 9183e7c426 Version 1.73 WIP 5 years ago
Chris Savoie 949a9fa2cb Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. (#2698) 5 years ago
omar a1164399b0 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 5 years ago