Commit Graph

7935 Commits (31762a81734301e620f4f075a7ddaf41ab8f9de7)
 

Author SHA1 Message Date
omar 062b1f0463 Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. ()
omar 2eaf722fd7 Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. ()
omar a82be53407 Merge branch 'docking2' into viewport_docking
# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/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
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
omar 49533bc86e Examples: Enabled Docking + Nav by default in the branch. ()
omar e381f22ac1 Docking: Added Docking system. (Part 3) ()
omar 9ac1e93aa1 Docking: Added Docking system. (Part 2) ()
omar bd5b38e232 Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) ()
omar 5adcb9ce6d Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).
omar 2ec135c9f7 Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.
omar 58d46e1fe6 Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (, )
omar c039a77d21 Internals: Added ImPool helper structure. Moved ImVec1f.
omar 741bdf151a Added ImGuiWindowFlags_UnsavedDocument flags.
omar 5070c769b8 Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
omar 52e0de84a9 Internals: Split RenderTextClipped into two functions.
omar eb7033e75b Version 1.66 WIP
omar b974fffea0 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
omar e0cab5664a Version 1.65
omar 5a679a45cc Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (, )
If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
omar a2616c79fe Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
omar e58bc3d5b7 Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ()
omar 0b18c11440 Refactor: Moved ImFile functions. ()
omar ab64e8f993 Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. ()
omar 31b5b18611 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
omar bb3184af74 Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ()
omar cbdce80837 Internals: Refactor: Moved render functions to their own section. ()
omar 8601c39571 Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ()
omar af27ec296b Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
# Conflicts:
#	imgui.cpp
#	imgui.h
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. ()
omar 77ba883f23 Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. () + changed ImGuiIO layout.
omar bbcc976739 Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
omar b944aa623c Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
omar a848807847 Minor inconsequential merges from Master/Docking branches
omar bdb30d7145 Merge branch 'master' into viewport
omar 897e5c6231 Viewport: Moved code following refactor. (, )
omar 40db2ca098 Fixed a build issue with non-Cygwin GCC under Windows.
omar 5451cb7e1e Readme, Changelog ()
omar 1007873d94 Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
Jiří Šebele f8b7e4d94f Examples: imgui_impl_opengl3 Fix GLAD error condition (, )
`gladLoadGL` returns 0 on fail, not the other way around.
omar d07f494305 Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ()
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
omar bcb1441ce7 Version 1.65 WIP
omar fd201a90f1 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
omar 767649afb1 Fix missing include on some systems to use intptr_t. (, )
omar 5d40d295b3 Comments, readme updates
Omar Cornut be6ea86f8d OSX: Added imgui_widgets.cpp to xcode project files.
omar a52ce7ac8b Merge branch 'master' into viewport
omar fd90afef43 Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (, )
omar 5207afa0dd Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (, )
omar 9174958b43 imgui_stl: Comments ()
omar 0699310b9c Merge branch 'viewport_164' into viewport
omar 0c24fe276c Merge branch 'master_164' into viewport_164
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp