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

738 Commits (docking)

Author SHA1 Message Date
4Benj_ 33ba370809 Merge remote-tracking branch 'upstream/docking' into docking 3 years ago
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
cfillion 7d7bf993bb ImDrawList: Fix texture-based anti-aliasing with RGBA textures (#5132, #3245) 
When using an Alpha8 font texture, GetTexDataAsRGBA32 converts 0x00 to transparent white.
When using a RGBA32 font texture, ImFontAtlasBuildRenderLinesTexData was writing transparent black.
 3 years ago
ocornut fd06ed833b Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104) 3 years ago
ocornut 279db55840 Updated stb_rect_pack.h from 1.00 to 1.01. (#5075) 
(our STBRP__CDECL change was merged)
 3 years ago
jakubtomsu 3deb92c2c5 Add IMGUI_STB_SPRINTF_FILENAME to support custom stb_printf.h include path (#5068, #2954) 3 years ago
TheCherno 972d43347c Merged from imgui/docking (1e14cc5) (v1.87 + some fixes) 3 years ago
ocornut 9948535118 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
 3 years ago
thedmd 4691fa0ed5 ImDrawList: PthArcTo: Add small tolerance when comparing angles (#4993) 3 years ago
ocornut 88de982071 Version 1.88 WIP 3 years ago
ocornut aa86800092 Internals: rework RenderMouseCursor() signature so we can use it in docking branch more naturally. (Merged from master+ rework for docking) 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
 3 years ago
ocornut 97b1abd6dd Internals: rework RenderMouseCursor() signature so we can use it in docking branch more naturally. 3 years ago
ocornut 1ee252772a Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 3 years ago
ocornut c71a50deb5 Version 1.87 3 years ago
ocornut d378e4088f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
 3 years ago
Clownacy 422902dbda Correct typos (#4954, #4955), use IM_STATIC_ASSERT now that old pre-C++11 macro has been obsoleted. 3 years ago
ocornut d5f0d45ae4 Merge branch 'master' into docking + remove two _PopUnusedDrawCmd() from docking branch, following 718daa1 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
 3 years ago
ocornut 075f4ac661 Don't merge ImDrawCmd which have had their IdxOffset changed to not be sequential. Fixed CTRL+Tab into an empty window causing artefacts on the highlight rectangle due to bad reordering on ImDrawCmd. 
This is bit of a weird edge case adding weight to ImDrawCmd merging, if we could rework the mess in RenderDimmedBackgroundBehindWindow() we may be able to undo some of that.
 3 years ago
ocornut afb1180d7d Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
 3 years ago
Jonathan Hoffstadt 83d22f4e48 Tables, ImDrawListSplitter: Fixed erroneously stripping trailing ImDrawList::AddCallback().(#4843, #4844) 3 years ago
ocornut 2aa9959553 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 3 years ago
ocornut 89a28209e8 Version 1.87 WIP + Backends: OpenGL3: Fixed a buffer overflow in imgui_impl_opengl3_loader.h init, added in 1.86 (#4468, #4830) 3 years ago
ocornut 15b4a064f9 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	examples/example_marmalade/main.cpp
#	imgui.cpp
#	imgui.h
 3 years ago
ocornut 512c54bbc0 Version 1.86 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
ocornut d7350668d1 Fix OSX warnings + Examples/Apple+GL2 calls super reshape. (#4759, #1873) 3 years ago
SlavicPotato f71ee5203e Fix infinite loop in ImFontGlyphRangesBuilder::AddRanges if the user passes upper range = UINT16_MAX without IMGUI_USE_WCHAR32. (#4802) 3 years ago
ocornut 270d4d0855 Nav, Docking: Fix crash on dimming docked window and DockSpaceOverViewport() with PassthruCentralNode. 
(amend 1dc3af3, 23ef6c1, 657073a)

# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 0647cf434c Nav, Docking: Fix crash on dimming docked window and DockSpaceOverViewport() with PassthruCentralNode. 
(amend 1dc3af3, 23ef6c1, 657073a)
 3 years ago
ocornut b16f738d04 Docking: docked windows honor ImGuiCol_WindowBg. Host window in charge of rendering seams. (#2700, #2539 + Docked windows honor display their border properly. (#2522) 
Plus: better support for transparent one in nodes
Side effects: DockContextBindNodeToWindow doesn't alter node->IsVisible.
Side effects: ImDrawList:: _ResetForNewFrame() needs to merge, sane (in case of
(Amended, force-pushed)
 3 years ago
ocornut bf80204e63 Docking: internals: extracted rounding corner calculation into reusable CalcRoundingFlagsForRectInRect() function. 3 years ago
ocornut 848d21b6b5 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	imgui.cpp
#	imgui_widgets.cpp
 3 years ago
ocornut 5b1a70aa2d Fixed RenderRectFilledWithHole() (used by docking) + added dummy EndFrameDrawDimmedBackgrounds() stub in master. 
The round corner flag change in 033dfd9d forgot to default to _None.
 3 years ago
ocornut 3fde445b91 Misc: Added missing ImGuiMouseCursor_NotAllowed cursor for software rendering (when io.MouseDrawCursor is enabled). (#4713) 3 years ago
ocornut 9b59455184 Merge branch 'master' into docking 
# Conflicts:
#	imgui.h
 3 years ago
ocornut e3bd9434b1 1.86 WIP + internals: tweaks table temp data code. 3 years ago
ocornut 1b215ecb01 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 3 years ago
ocornut 55d35d8387 Version 1.85 3 years ago
ocornut dedb381c51 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	examples/imgui_examples.sln
#	imgui.cpp
#	imgui.h
 3 years ago
TheCherno edc2f15f5b [v1.84.2] Merged from imgui/docking 3 years ago
ocornut 4a7c21d330 Fonts: Fixed ImFontAtlas::ClearInputData() marking atlas as not built. (#4455, #3487) 3 years ago
ocornut 0649f750b4 Version 1.85 WIP 3 years ago
ocornut 5a7d18a441 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 3 years ago
ocornut d2ffbd9b86 Version 1.84 
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
 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 cb00972b87 ImDrawList: Fix AddCircle{Filled} with 12 segment case (#4419, #4421) 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
ocornut 327a5d8253 Fix warning + apply trailing whitespaces in stb_ libs (as applied on nothings/stb on 2020/02/02, facilitating further diffs) 3 years ago
ocornut 23a15834fa Fonts: Fix calling ClearTexData() (clearing CPU side font data) triggering an assert in NewFrame(). (#3487) + Backends: added additional assert to facilitate detecting user understand they haven't initialized a backend. 3 years ago
ocornut b5a2bd1a5b Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys(). 
No need to clear fields before deletion. DX12: renamed to match docking branch.
 3 years ago