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

1378 Commits (6cc380fc4168c0cde2bbbe6182525f4bb47899e2)

Author SHA1 Message Date
omar 6cc380fc41 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
 6 years ago
omar 61d94ff88e Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete). 6 years ago
omar a7d3ae8937 BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698, #894, #713) + reworked the Begin/BeginChild comments in imgui.h. 6 years ago
omar 781a7950d7 ImVector: Fixed a oddly unqualified return type in the assignment operator (I assume C++ handles it nicely as this never warned anywhere, but it is completely unintentional). 6 years ago
omar b85f345369 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
 6 years ago
ice1000 201fcfd2e5 Internals: Replace unsigned short with ImWchar when dealing with character storage. (#2078) 6 years ago
omar df65d4a14f Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 6 years ago
omar eb7033e75b Version 1.66 WIP 6 years ago
omar b974fffea0 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 6 years ago
omar e0cab5664a Version 1.65 6 years ago
omar 8601c39571 Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542) 6 years ago
omar af27ec296b Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags 
# Conflicts:
#	imgui.cpp
#	imgui.h
 6 years ago
omar 65876f348a Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787) 6 years ago
omar 77ba883f23 Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout. 6 years ago
omar bbcc976739 Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent. 6 years ago
omar b944aa623c Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';' 6 years ago
omar a848807847 Minor inconsequential merges from Master/Docking branches 6 years ago
omar bdb30d7145 Merge branch 'master' into viewport 6 years ago
omar bcb1441ce7 Version 1.65 WIP 6 years ago
omar 0c24fe276c Merge branch 'master_164' into viewport_164 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
 6 years ago
omar 48db5713d6 Version 1.64 6 years ago
omar 6c34bffbb5 Version 1.64 WIP 6 years ago
omar f2aa124eb8 Version 1.64 WIP 6 years ago
omar 36b2f64051 Merge branch 'master' into viewport 
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
 6 years ago
omar 9e0f24dcb6 Version 1.63 6 years ago
omar ec148988f0 Reordered some declarations in imgui.h (in prevision of 1.64 refactor) 6 years ago
omar f81caac459 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui.h
 6 years ago
omar a082692b0a ImFontAtlas Comments (#2042) + added ImGuiFontAtlas_None for consistency. 6 years ago
omar 042f88e5f0 Removed obsolete redirection functions: CollapsingHeader() variation with 2 bools - marked obsolete in v1.49, May 2016. 6 years ago
omar 3612885dea Comments, demo 6 years ago
omar 0810d57819 Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). (#820, #956, #1875, #2034) 6 years ago
omar e28b1078f5 Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. (#2034) 6 years ago
omar 102d5e6de6 Rearrange header comments to find enums easily + fixed inconsistent sorting. 6 years ago
omar a4191857c1 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_vulkan.h
#	imgui.cpp
 6 years ago
omar ea9f5d7600 Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). (#2035, #2006, #1443, #1008) 6 years ago
omar 8d639ec60d InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008). 6 years ago
omar 2dc5ec95d7 Internals: InputText: Renaming. Comments. 6 years ago
omar 9f393c38e9 InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete). 6 years ago
omar 24ff259816 InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008). 6 years ago
omar 4de6e1f7e4 InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size. 6 years ago
omar e6c78f9470 InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) (#211) 6 years ago
omar 5942c08143 Added IMGUI_VERSION_NUM for easy compile-time testing. (#2025) 6 years ago
omar 9d7480774f Merge branch 'master' into viewport 6 years ago
omar 8972ebae73 Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. (#1565, #1599, #586) 7 years ago
omar 4e33aeed82 Selectable: Added ImGuiSelectableFlags_Disabled flag in the public API. (#211) 7 years ago
omar e5f2295398 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 7 years ago
omar bc6ac8b2ae Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame. 
Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.
 7 years ago
omar 8ef0ca9765 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 7 years ago
omar cc64bd9e3c Comments 7 years ago
omar 87e2fea09d Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650) 
Demo: Exposed flags in Demo.
 7 years ago