7eadcf7d7d
example_glfw_vulkan was missing a reference to imgui_widgets.cpp ( #2071 , #2036 )
2018-09-09 21:09:58 +02:00
062b1f0463
Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. ( #2067 )
2018-09-07 22:30:46 +02:00
2eaf722fd7
Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. ( #2066 )
2018-09-07 17:24:56 +02:00
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
2018-09-06 22:28:21 +02:00
49533bc86e
Examples: Enabled Docking + Nav by default in the branch. ( #351 )
2018-09-06 21:53:35 +02:00
e381f22ac1
Docking: Added Docking system. (Part 3) ( #351 )
2018-09-06 21:45:46 +02:00
9ac1e93aa1
Docking: Added Docking system. (Part 2) ( #351 )
2018-09-06 21:45:46 +02:00
bd5b38e232
Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) ( #351 )
2018-09-06 21:45:46 +02:00
5adcb9ce6d
Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).
2018-09-06 21:45:45 +02:00
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.
2018-09-06 21:45:45 +02:00
58d46e1fe6
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. ( #261 , #351 )
2018-09-06 21:45:44 +02:00
c039a77d21
Internals: Added ImPool helper structure. Moved ImVec1f.
2018-09-06 21:45:10 +02:00
741bdf151a
Added ImGuiWindowFlags_UnsavedDocument flags.
2018-09-06 21:45:10 +02:00
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)
2018-09-06 21:45:09 +02:00
52e0de84a9
Internals: Split RenderTextClipped into two functions.
2018-09-06 21:45:09 +02:00
eb7033e75b
Version 1.66 WIP
2018-09-06 21:44:59 +02:00
b974fffea0
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-06 15:59:35 +02:00
e0cab5664a
Version 1.65
2018-09-06 15:58:58 +02:00
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. ( #1718 , #2036 )
...
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.
2018-09-06 15:58:25 +02:00
a2616c79fe
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-06 11:42:11 +02:00
e58bc3d5b7
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )
2018-09-06 11:36:00 +02:00
0b18c11440
Refactor: Moved ImFile functions. ( #2036 )
2018-09-06 11:36:00 +02:00
ab64e8f993
Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. ( #2036 )
2018-09-06 11:36:00 +02:00
31b5b18611
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-05 20:59:27 +02:00
bb3184af74
Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )
2018-09-05 20:54:28 +02:00
cbdce80837
Internals: Refactor: Moved render functions to their own section. ( #2036 )
2018-09-05 20:46:57 +02:00
8601c39571
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ( #1542 )
2018-09-05 17:50:55 +02:00
af27ec296b
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-09-05 17:38:47 +02:00
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 )
2018-09-05 17:33:00 +02:00
77ba883f23
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.
2018-09-05 17:29:47 +02:00
bbcc976739
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
2018-09-05 17:29:47 +02:00
b944aa623c
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
2018-09-05 11:52:48 +02:00
a848807847
Minor inconsequential merges from Master/Docking branches
2018-09-05 11:51:45 +02:00
bdb30d7145
Merge branch 'master' into viewport
2018-09-05 11:08:57 +02:00
897e5c6231
Viewport: Moved code following refactor. ( #2036 , #1542 )
2018-09-05 11:08:44 +02:00
40db2ca098
Fixed a build issue with non-Cygwin GCC under Windows.
2018-09-04 18:58:20 +02:00
5451cb7e1e
Readme, Changelog ( #2059 )
2018-09-04 11:48:08 +02:00
1007873d94
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
2018-09-03 19:51:22 +02:00
f8b7e4d94f
Examples: imgui_impl_opengl3 Fix GLAD error condition ( #2059 , #2002 )
...
`gladLoadGL` returns 0 on fail, not the other way around.
2018-09-03 19:36:02 +02:00
d07f494305
Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ( #2036 )
...
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
2018-09-03 14:49:13 +02:00
bcb1441ce7
Version 1.65 WIP
2018-09-03 14:38:04 +02:00
fd201a90f1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-08-31 18:39:02 +02:00
767649afb1
Fix missing include on some systems to use intptr_t. ( #2036 , #2054 )
2018-08-31 18:07:47 +02:00
5d40d295b3
Comments, readme updates
2018-08-31 11:37:14 +02:00
be6ea86f8d
OSX: Added imgui_widgets.cpp to xcode project files.
2018-08-31 11:29:25 +02:00
a52ce7ac8b
Merge branch 'master' into viewport
2018-08-31 11:14:05 +02:00
fd90afef43
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) ( #2036 , #1542 )
2018-08-31 11:11:18 +02:00
5207afa0dd
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) ( #2036 , #1542 )
2018-08-31 11:06:21 +02:00
9174958b43
imgui_stl: Comments ( #2035 )
2018-08-31 10:53:38 +02:00
0699310b9c
Merge branch 'viewport_164' into viewport
2018-08-31 10:28:37 +02:00
