omar
|
5105c6c0d0
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
6 years ago |
|
omar
|
fb6ef8b1db
|
Comments, tweak
|
6 years ago |
|
omar
|
10e13dd6bb
|
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
|
6 years ago |
|
omar
|
ac10889bde
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
6 years ago |
|
omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
6 years ago |
|
omar
|
801645d350
|
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
|
6 years ago |
|
omar
|
34e18ef771
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
6 years ago |
|
omar
|
8289e5f6b4
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
6 years ago |
|
omar
|
84238240d6
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
6 years ago |
|
omar
|
7658035e5a
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
|
omar
|
3849def253
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
6 years ago |
|
omar
|
025e00cccc
|
About: Added build/system info relating to Docking branch.
|
6 years ago |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
ec49a486c7
|
About: Added build/system info relating to Viewport branch.
|
6 years ago |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
6 years ago |
|
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
|
omar
|
4ef06f5aa2
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
6 years ago |
|
omar
|
3bcc25f588
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
c08b4b46f4
|
Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196)
|
6 years ago |
|
omar
|
962dcb466d
|
Docking: Added ImGuiDockNodeFlags_NoResize. (#2109)
|
6 years ago |
|
omar
|
ddc3f8f069
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
131de7ab62
|
Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109)
|
6 years ago |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
6 years ago |
|
omar
|
2515413080
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
da3c4330c1
|
Version 1.66
|
6 years ago |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
Torkel Bjørnson-Langen
|
1441756a0f
|
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() (#2153)
|
6 years ago |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
f3e642322f
|
Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.
|
6 years ago |
|
omar
|
eed1fba157
|
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. (#2152)
|
6 years ago |
|
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
6 years ago |
|
omar
|
c547b2e8ee
|
Added DockSpaceOverViewport() call, not sure about this because of the menu bar limitation. (#2109)
|
6 years ago |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
000c1fc221
|
Demo: Added comments / tweaks related to the popups.
|
6 years ago |
|
omar
|
90b50bd4c3
|
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660)
|
6 years ago |
|
omar
|
8b956216b7
|
Demo: Testing return value of BeginTabBar() for consistency.
|
6 years ago |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
0fe48cbb61
|
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035, #2096)
Added misc/README file.
|
6 years ago |
|
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
6 years ago |
|
omar
|
7b3433c68b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
6 years ago |
|
omar
|
84507cc744
|
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)
|
6 years ago |
|
omar
|
4e30698706
|
Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)
|
6 years ago |
|
omar
|
2dd8338e7d
|
Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109)
|
6 years ago |