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

1801 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
ocornut 28ba54a32a Internals: add AddSettingsHandler(), RemoveSettingsHandler(). 3 years ago
ocornut fd06ed833b Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104) 3 years ago
ocornut 0f14933577 Tables: Fixed incorrect border height used for logic when resizing one of several synchronized instance of a same table ID, when instances have a different height. (#3955, #3565) 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
ocornut 2dfa71fad5 Inputs: Fixed IsMouseClicked() repeat mode rate being half of keyboard repeat rate. Using KeyModAlt. Removed KeyModsPrev. 3 years ago
ocornut 5854da10e6 Declare other structures as constexpr (#4995) + rename ImGuiInputEventType_Char to ImGuiInputEventType_Text for consistency with event structure. 3 years ago
ocornut aa79d0cd2f Stack Tool: Added option to copy item path to clipboard. (#4631) 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 8eb8689391 Docking: Tabs use their own identifier (in order to make window->ID refer to whole window in test engine). Also prevents Tab ID from clashing with "" which was common. 3 years ago
ocornut d378e4088f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
 3 years ago
ocornut 6f73dbea80 TestEngine: submit window data to item system. 3 years ago
ocornut 35e197f413 TestEngine: fixed InvisibleButton() and ArrowButton() not calling the info macro. 3 years ago
ocornut 64d910ad37 Removed IMGUI_API from inline templated classes. (#4962) 3 years ago
ocornut 27004aca70 Revert moving ImGuiKeyModFlags to internal.h (amendc906c65) 
# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 49e38a5b32 Revert moving ImGuiKeyModFlags to internal.h (amendc906c65) 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 c906c65cac (BREAKING) Replaced AddKeyModsEvent() added by 790132a in favor of unified key enum system. Backends: update most. (#4921, #4858) 
Sorry this is an unusual breaking but since we are WIP it is a good time to make a correction.
 3 years ago
ocornut 8555335935 Shallow alignment of ImGuiKey stuff + moving some in internals. Internals: add offset to ImBitArray<>, simpify ActiveIdUsingKeyInputMask. 3 years ago
ocornut cff0342454 Internals: moved lines into a Inputs section. 3 years ago
ocornut 3e0d6ec895 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 3 years ago
ocornut 62d6be3747 IO: Removed ImGuiInputSource from public api for now, unnecessary. (#4858, #787) 3 years ago
ocornut f33bb99821 IO: added AddKeyAnalogEvent() and support for ImGuiKey_GamepadXXXX. (#4858, #787) 3 years ago
ocornut 26d04c948f Tables: Fixed positioning of Sort icon on right-most column with some settings (not resizable + no borders). (#4918). 3 years ago
ocornut 97b1ffcb3b IO: Reorder enums, compact a little in header. Removed const from internal GetKeyData(). 3 years ago
ocornut 91ae56af45 Removed support for legacy arithmetic operators (+*/) when inputing text into a slider/drag. (#4917, #3184) 3 years ago
ocornut e278277d53 IO: added AddMouseViewportEvent() + used in backends. 3 years ago
ocornut 8567a4cca3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui_demo.cpp
#	imgui_internal.h
 3 years ago
ocornut 90a6961638 IO: apply same flooring as UpdateMouseInputs() in dupe event processing. (#4858) + provision for test engine. 3 years ago
ocornut 7374b96f5c IO: Added input queue. (#4858, #2787, #1992, #3383, #2525, #1320) 3 years ago
ocornut eb823655af Removed support for pre-C++11 compilers. We'll stop supporting VS2010. (#4537) 
Build all
 3 years ago
ocornut 0647ba3bad Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
 3 years ago
ocornut 290c51735e Fixed warning in ImFloorSigned(). (#4889) 3 years ago
ocornut 956e03009a Backends: OSX: Build fIx. Made GetKeyName() input tolerant. Internals: added GetNavInputName(). 3 years ago
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 bf08c13e9b Inputs: Extra Keys / AddKeyEvent(): bidirectional mapping, basic CI, simplify backends, asserts on misuses, tested backward compat. (#2625, #4858, #2787) 
(edit: simplified backends merged into previous commits to make history clearer)
 3 years ago
thedmd 3b66929301 Inputs: Extra Keys / AddKeyEvent(): Added ImGuiKey values, io.AddKeyEvent(), GetKeyName(), IMGUI_DISABLE_OBSOLETE_KEYIO. Obsoleted GetKeyIndex(), io.KeyMap[], io.KeysDown[]. (#2625, #4858, #2787) 3 years ago
ocornut 704ab1114a Merge branch 'master' into docking. Remove Platform_SetImeInputPos. Remove backend-side IME implementation. Rrevert removal of MouseDragMaxDistanceAbs in 206b9ea. (#2589, #3113) 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp
 3 years ago
ocornut 2706c9d66e Platform IME: reworked internals to simplify adding new features. 3 years ago
ocornut 9c8f288d1a Viewports: Fixed a CTRL+TAB crash with viewports enabled (#4023, #787) (amend 1dc3af3, 23ef6c1, 657073a) 
+ Expose FindHoveredViewportFromPlatformWindowStack() in imgui_internal.h
 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 980deb4c9e Add missing include guard to avoid declaring ImFontAtlasGetBuilderForStbTruetype() function. 
https://github.com/cimgui/cimgui/issues/193
https://github.com/imgui-rs/imgui-rs/pull/582
 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