3233d85d2f
Merge branch 'master' into docking
5 years ago
80b3ab7d3e
TabBar: Fixed single tab shrinking reducing the tab to 0.0f size. Broken by a856c670c1.
5 years ago
38d22bc47d
ColorPicker / ColorEdit: restore Hue when zeroing Saturation. ( #2722 , #2770 ) - changelog, fixed uninitialized variables, tweaks, renaming.
5 years ago
accb0261b8
ColorPicker / ColorEdit: restore Hue when zeroing Saturation. ( #2722 , #2770 )
...
Issue is fixed by storing last active color picker color and last hue value when active color picker takes rgb as input. Then if current color picker color matches last active color - hue value will be restored. IDs are not used because ColorEdit4() and ColorWidget4() may call each other in hard-to-predict ways and they both push their own IDs on to the stack. We need hue restoration to happen in entire stack of these widgets if topmost widget used hue restoration. Since these widgets operate on exact same color value - color was chosen as a factor deciding which widgets should restore hue.
5 years ago
af93c21cf9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
9d02ed51e3
TreeNode: Added ImGuiTreeNodeFlags_SpanAvailWidth and ImGuiTreeNodeFlags_SpanFullWidth flags ( #2451 , #2438 , #1897 )
...
Added demo bits.
5 years ago
575df6f192
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
5 years ago
3f986e72d9
Internal: Offset STB_TEXTURE_K_ defines to remove that change from #2541 + sponsors update.
5 years ago
7d5a17e5e4
Remove trailing spaces (grep for ' \r?$' in visual studio)
5 years ago
404dc0367e
BeginTabItem: Fixed case where right-most tab would create an extraneous draw calls (probably related to other tab fitting code in 1.73 wip)
5 years ago
3dcf323c35
Columns: Separator: Fixed a bug where non-visible separators within columns would alter the next row position differently than visible ones.
...
Fixed rounding issues also leading to change of ScrollMax depending on visible items (in particular negative coordinate would be rounded differently)
5 years ago
3cf519c9cb
Fix DragScalar for unsigned types ( #2780 )
...
decreasing the value was broken on arm64
5 years ago
0bdc145343
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
0537ac005f
ColorEdit: Disable Hue edit when Saturation==0 instead of letting Hue values jump around.
5 years ago
b59ec7b9b7
DragInt, DragFloat, DragScalar: Using (v_min > v_max) allows locking any edit to the value.
5 years ago
3f99890f40
TabBar: feed desired width (sum of unclipped tabs width) into layout system to allow for auto-resize. ( #2768 )
...
Before 1.71 tab bars fed the sum of current width which created feedback loops in certain situations. Amend f95c77eeea
5 years ago
f8d3d8d7f5
TabBar: improved shrinking for large number of tabs to avoid leaving extraneous space on the right side. Individuals tabs are given integer-rounded width and remainder is spread between tabs left-to-right.
5 years ago
c8418015c2
SliderScalar: Improved assert when using U32 or U64 types with a large v_max value. ( #2765 )
...
+ misc minor stuff.
5 years ago
e1fca8d982
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
a856c670c1
TabBar: fixed single-tab not shrinking their width down.
...
+ minor typo fixes (#2738 )
5 years ago
aedcd2fb1a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
5 years ago
7abd41bd5f
TabBar: fixed ScrollToBar request creating bouncing loop when tab is larger than available space.
5 years ago
9fce278918
ColorPicker: Made rendering aware of global style alpha of the picker can be faded out. ( #2711 )
...
Note that some elements won't accurately fade down with the same intensity, and the color wheel when enabled will have small overlap glitches with (style.Alpha < 1.0).
5 years ago
f624455d7b
Version 1.73 WIP
6 years ago
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
6a0d0dab5a
Version 1.72b (patch for nav)
6 years ago
27079e68c2
Nav: Made hovering non-MenuItem Selectable not re-assign the source item for keyboard navigation.
6 years ago
5ef7445d92
Internal: Avoid using GImGui multiple times in same function.
6 years ago
9183e7c426
Version 1.73 WIP
6 years ago
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
ecb9b1e2eb
Version 1.72
6 years ago
824e8c53b4
Internals: Added IMGUI_DEBUG_INI_SETTINGS. Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.
6 years ago
efc4c0fe9d
Internals: Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.
6 years ago
db2581bee9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
baae057a03
Internals: Merge in minor noise from wip Tables branch to simplify further merging.
6 years ago
51853292cc
ImDrawList: Using ImDrawCornerFlags instead of int in various apis.
...
Demo: Using ImGuiColorEditrFlags instead of int.
6 years ago
dcd03f62a7
Scrolling: Made it possible for mouse wheel and navigation-triggered scrolling to override a call to SetScrollX()/SetScrollY(), making it possible to use a simpler stateless pattern for auto-scrolling.
...
Demo: Log, Console: Using a simpler stateless pattern for auto-scrolling.
6 years ago
34cf00566f
InputTextMultiline: Fixed vertical scrolling tracking glitch.
...
Fixed Travis-CI banner address.
6 years ago
6f8d34768d
Docking: Removed seemingly unnecessary test in TabItemEx() for undocking tab leading to window move. Added ImGuiDockNode::IsFloatingNode() helper to clarify code intent in various places.
6 years ago
9cda3035fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
f0348ddffc
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
6 years ago
0f86116a69
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
6 years ago
c37f21788f
Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with other column functions + fixed Columns demo ( #2683 )
6 years ago
9f35ba8546
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
b443bc0a64
Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. ( #125 , #2666 )
6 years ago
4abc2a82e0
Columns: Made the right-most edge reaches up to the clipping rectangle (removing WindowPadding.x*0.5 worth of asymmetrical/extraneous padding). ( #125 , #2666 )
...
+ Moved a few things in BeginColumns().
6 years ago
493795cdd1
Columns: Fix support for BeginColumns() with a count of 1 (not that this isn't available via the old Columns() api). Tweaked Demo to facilitate testing for it.
6 years ago
44336950e9
Revert "Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. ( #125 , #2666 )"
...
This reverts commit 6c16ba6490
6 years ago
7fd34d4f30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
6c16ba6490
Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. ( #125 , #2666 )
6 years ago
omar
Rokas Kupstys
Bagrat Dabaghyan
Aaron Cooper