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

641 Commits (ac9512e095f98555dece5891c1f41df0bef49d94)

Author SHA1 Message Date
omar ac9512e095 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 6 years ago
omar f1c7596409 Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo. 6 years ago
omar 9b09c7597f Merge branch 'viewport' into docking 
# Conflicts:
#	imgui_demo.cpp
 6 years ago
omar 2a1e903f43 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.h
 6 years ago
omar 8497948ba0 Comments, minor tweaks. 6 years ago
omar 991b16cc6a Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_widgets.cpp
 6 years ago
omar ccce47c6a2 Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples. 6 years ago
omar 2886e0b6f5 Demo: Fix collateral damage of 54a60aa 6 years ago
omar 95dcc534ed Demo: Fix collateral damage of 54a60aa 6 years ago
omar 067b691fd8 Merge branch 'viewport' into docking 
# Conflicts:
#	docs/TODO.txt
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_draw.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 6 years ago
omar c40feabe4d Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 6 years ago
omar 54a60aaa40 Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature) 
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
 6 years ago
omar e6439e1a16 Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 6 years ago
omar 26b9e2d0a5 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 6 years ago
omar 9476e07d5a Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. (#899) 
Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height.
 6 years ago
omar 59f3c4fc20 Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do. 6 years ago
omar b96b1f2412 Docking: Documenting an issue. Renamed member of ImGuiDockFamily. 6 years ago
omar 6644f1ff64 Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes). 
Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those.
 6 years ago
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