thedmd
|
a961958bdc
|
Cherry-pick 99d4b0f44 from thedmd/imgui/layouts
|
3 years ago |
ocornut
|
5a7d18a441
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
3 years ago |
|
ocornut
|
d2ffbd9b86
|
Version 1.84
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
|
3 years ago |
|
ocornut
|
c543d93af1
|
Expose BeginDisabled()/EndDisabled() in public API. Add to demo. (#211)
|
3 years ago |
|
ocornut
|
0b06c4b2b0
|
Merge branch 'master' into docking (will need further for io.AddFocusEvent)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
3 years ago |
|
ocornut
|
b380d3abe3
|
Backends: OpenGL3: Clarify use of GL_POLYGON_MODE.
|
3 years ago |
|
ocornut
|
a11f36811f
|
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_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
4 years ago |
|
ocornut
|
ba1c8464ef
|
Internals: Removed ImGuiButtonFlags_Disabled (which had inconsistent behavior) in favor of ImGuiItemFlags_Disabled. Selectable()'s ImGuiSelectableFlags_Disabled now uses the later. (#211)
|
4 years ago |
|
ocornut
|
3512f2c2c2
|
Internals: Menus: minor tidying up + renaming in ImGuiMenuColumns + removing extraneous offset field which is always zero + using smaller types.
sizeof() 36 -> 20
|
4 years ago |
|
ocornut
|
b5a2bd1a5b
|
Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys().
No need to clear fields before deletion. DX12: renamed to match docking branch.
|
4 years ago |
|
ocornut
|
ac35b4bba2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
4 years ago |
|
ocornut
|
1965f38e9e
|
ImGuiWindowFlags_UnsavedDocument/ImGuiTabItmeFlags_UnsavedDocument display a dot instead of a '*'.
|
4 years ago |
|
ocornut
|
f0c4d609a6
|
Default window focus scope not 0. Added ImGuiSelectableFlags_SelectOnNav with comments and caveats. (#1861, #4242,)
Focus scope default value: amend 7ee623d9 a5041c88 2ebe08be
|
4 years ago |
|
ocornut
|
a15c42d5bd
|
Nav: moved RenderNavHighlight() calls of TreeNode and Selectable out of if (hovered || selected) tests. Should make no difference as NavId currently returns hovered. (#1861, #4242)
|
4 years ago |
|
ocornut
|
0cca0d1617
|
Internals/experimental: BeginComboPreview(), EndComboPreview(). (#4168, #1658)
(amended)
|
4 years ago |
|
ocornut
|
a44d4da87c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
4 years ago |
|
ocornut
|
6ee398ac2b
|
Tables: Added ImGuiTableColumnFlags_Disabled acting a master disable over (hidden from user/context menu). (#3935, #3740)
|
4 years ago |
|
ocornut
|
1b4323a1b4
|
Tables: Added ImGuiTableColumnFlags_NoHeaderLabel to request TableHeadersRow() to not submit label for a column. (#4206)
|
4 years ago |
|
ocornut
|
f53db3541a
|
Docking: comments (#4189)
|
4 years ago |
|
ocornut
|
1ad1429c6d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
4 years ago |
|
ocornut
|
3a941f95e9
|
Metrics, Demo: moved font details display to metrics code. (#4171)
|
4 years ago |
|
ocornut
|
e31d13fa76
|
Version 1.84 WIP
|
4 years ago |
|
ocornut
|
1b435ae3e0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
4 years ago |
|
ocornut
|
ad5d1a8429
|
Version 1.83
|
4 years ago |
|
ocornut
|
c708299ca9
|
Docs: Improvements to description of using colored glyphes/emojis. (#4169, #3369) + Add Fonts to Metrics. Removed IMGUI_HAS_TABLE markers.
|
4 years ago |
|
ocornut
|
5d77b6f274
|
Docs: update links, sponsors
|
4 years ago |
|
ocornut
|
31290807dc
|
Merge branch 'master' into docking
+ fix warning fix for mingw+dx9
# Conflicts:
# backends/imgui_impl_dx9.cpp
# imgui.cpp
|
4 years ago |
|
ocornut
|
2c3f25d2d9
|
Nav: Fixed Tabbing initial activation from skipping the first item if it is tabbable through. (#787)
|
4 years ago |
|
ocornut
|
89162a04f4
|
Fixes for PVS Studio and MSVC static analyzers. Using a macro to suppress single-use MSVC false positives. (#3938, #4073)
|
4 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.
|
4 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 |