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

1161 Commits (fa1f540e6c64ae66623cff579cd4de30d594ffdb)

Author SHA1 Message Date
ocornut 1ad1429c6d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 3 years ago
ocornut 3a941f95e9 Metrics, Demo: moved font details display to metrics code. (#4171) 3 years ago
ocornut e31d13fa76 Version 1.84 WIP 3 years ago
ocornut 1b435ae3e0 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 3 years ago
ocornut ad5d1a8429 Version 1.83 3 years ago
ocornut c708299ca9 Docs: Improvements to description of using colored glyphes/emojis. (#4169, #3369) + Add Fonts to Metrics. Removed IMGUI_HAS_TABLE markers. 3 years ago
ocornut 5d77b6f274 Docs: update links, sponsors 3 years ago
ocornut 31290807dc Merge branch 'master' into docking 
+ fix warning fix for mingw+dx9
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp
 3 years ago
ocornut 2c3f25d2d9 Nav: Fixed Tabbing initial activation from skipping the first item if it is tabbable through. (#787) 3 years ago
ocornut 89162a04f4 Fixes for PVS Studio and MSVC static analyzers. Using a macro to suppress single-use MSVC false positives. (#3938, #4073) 3 years ago
ocornut d28535f351 Fixes for Visual Studio 2019 static analyzers. (#3938, #4073) + two minor edge case were invalid scalar input (e.g. a sign only) would return buffer as modified. 3 years ago
ocornut 34d4bc620d Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
 4 years ago
ocornut 5fed6bdc72 Demo: Improved popups demo and comments. 4 years ago
ocornut 3ed07a8f0b Docking: removed io.ConfigDockingWithShift option. (#2109) 4 years ago
ocornut e7577d570e Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 4 years ago
ocornut 59da01901e Scrolling: Fix scroll tracking with e.g. SetScrollHereX/Y() when WindowPadding < ItemSpacing. Fix scroll snapping on edge of scroll region when both scrollbars are enabled. 
CalcNextScrollFromScrollTargetAndClamp() fixed snapping edge calculation missing ScrollbarSizes.y
 4 years ago
ocornut 81e0b18e38 Merge branch 'master' into docking 4 years ago
ocornut a1a39c632a Version 1.83 WIP 4 years ago
ANF-Studios ebe6ac5fb5 Improvements to minor mistakes in documentation comments (#3923) 4 years ago
ocornut 256594575d Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
ocornut 35b1148efb Version 1.82 4 years ago
ocornut 0157502eab ImDrawFlags: rework/revert c2d6d26 + 39432bf in a way that is closer to old version and back to opt-in but with default 0 = all corners. 4 years ago
ocornut 033dfd9d35 ImDrawFlags: rework/revert c2d6d26 + 39432bf in a way that is closer to old version and back to opt-in but with default 0 = all corners. 4 years ago
ocornut f1bf642e8f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis
 4 years ago
ocornut 39432bfd9c Amend 0c93238a ImDrawList: upgraded AddRect(), AddRectFilled(), PathRect() to use general ImDrawFlags instead of ImDrawCornersFlags 4 years ago
Rokas Kupstys c2d6d26139 ImDrawList: upgraded AddRect(), AddRectFilled(), PathRect() to use general ImDrawFlags instead of ImDrawCornersFlags 4 years ago
ocornut 80533ea5e1 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 4 years ago
Rokas Kupstys b53b8f58df Demo: Use correct string formats on non-windows platforms. 
(amended)
 4 years ago
ocornut 1ddaff83d8 Demo: Tweak inputs display. 4 years ago
ocornut 6aee4bcdc5 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
chirsz cdf1926f21
Fix a typo in the demo text (#3840) 4 years ago
ocornut ffa863a3ba Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
 4 years ago
ocornut fb15d8c858 Improve on automatic circle segment count calculation. (#3808) Amends 4 years ago
thedmd f107693d9b Improve on automatic circle segment count calculation. (#3808) 4 years ago
ocornut b47aa46d81 Tables: TableSetupColumn() user id uses ImGuiID as intended (typedef ImU32). internals: added GetCurrentTable(), LeftMostEnabledColumn. Demo/docs tweaks. 4 years ago
ocornut 30b7545841 Version 1.82 WIP 4 years ago
ocornut 239d09804d Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 4 years ago
ocornut 4df57136e9 Version 1.81 4 years ago
ocornut ee59d7a266 Merge branch 'features/viewport_in_master' into docking (WIP need adding code for new ImGuiViewportFlags values) 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 4 years ago
ocornut f14042ca78 Viewports Added ImGui::GetMainViewport() as a way to get the bounds and work area of the host display. (#3789, #1542) 
Viewports: Backport a few constructs from 'docking' branch.
Viewports: Added ImGuiViewportFlags_IsPlatformWindow, ImGuiViewportFlags_IsPlatformMonitor, ImGuiViewportFlags_OwnedByApp (none of them were in docking branch yet). ImGuiViewportFlags_IsPlatformMonitor is merely there to convey future intent, not yet used.
Reduce uses of io.DisplaySize.
MainMenuBar: Backport work area handling code from 'docking' branch.
Metrics: Backported "Viewports" debug visualizer from 'docking' branch.
Demo: Rework 'Examples->Fullscreen Window'.
Demo: 'Simple Overlay' demo now moves under main menu-bar (if any) using GetMainViewport()'s work area.
 4 years ago
ocornut 2a5eaf239f Misc tweaks - mostly toward minimizing diff in upcoming backport merge of a few viewport structures in master 4 years ago
ocornut 7a516a266d Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
 4 years ago
ocornut 73ccb7e4b8 Viewports: (Breaking) turned GetWorkPos(), GetWorkSize() into straight fields -> WorkPos, WorkSize before exposing in master branch. 4 years ago
ocornut 1a3af8cb4c Viewports: trying to treat GetMainViewport() as const. Reducing unnecessary casts of ImGuiViewportP* 
Metrics: readded root Drawlists node in metrics to match master.
The (void*) casts are implying const-casst but currently left GetMainViewport() as returning non-const.
 4 years ago
ocornut 56f7bdae99 ImDrawList: Clarified PathArcTo() need for a_min <= a_max with an assert. Fixed PathArcToFast() handling of a_min > a_max. 4 years ago
ocornut b898281e3c Demo: Added 'Examples->Fullscreen Window' demo. (#3789) + repack and zero-clear ImDrawData. 4 years ago
ocornut 03d74a293d ListBox: renamed ListBoxHeader>BeginListBox, ListBoxFooter>EndListBox. Added demo bits. 4 years ago
ocornut 6f6d4e0b70 ListBoxHeader: In version taking height in number of items, made vertical padding consistent regardless of if (items_count <= height_in_items) or not. 
Demo: Tweaks.
 4 years ago
ocornut e5cbf60def ListBox: tweaked default height calculation. simplifying code internally (rework passing of full rect). Should have no visible side-effects + misc comments. 4 years ago
ocornut 577e7cb493 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago