omar
|
b8d8355f10
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-31 14:34:58 -07:00 |
|
omar
|
6a0d0dab5a
|
Version 1.72b (patch for nav)
|
2019-07-31 14:31:06 -07:00 |
|
omar
|
27079e68c2
|
Nav: Made hovering non-MenuItem Selectable not re-assign the source item for keyboard navigation.
|
2019-07-31 14:31:06 -07:00 |
|
omar
|
5ef7445d92
|
Internal: Avoid using GImGui multiple times in same function.
|
2019-07-30 16:51:12 -07:00 |
|
omar
|
9183e7c426
|
Version 1.73 WIP
|
2019-07-29 15:54:32 -07:00 |
|
omar
|
a1164399b0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-07-27 18:21:41 -07:00 |
|
omar
|
ecb9b1e2eb
|
Version 1.72
|
2019-07-27 18:15:07 -07:00 |
|
omar
|
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.
|
2019-07-23 21:37:09 -07:00 |
|
omar
|
efc4c0fe9d
|
Internals: Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.
|
2019-07-23 21:26:15 -07:00 |
|
omar
|
db2581bee9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-23 13:35:01 -07:00 |
|
omar
|
baae057a03
|
Internals: Merge in minor noise from wip Tables branch to simplify further merging.
|
2019-07-23 13:28:36 -07:00 |
|
omar
|
51853292cc
|
ImDrawList: Using ImDrawCornerFlags instead of int in various apis.
Demo: Using ImGuiColorEditrFlags instead of int.
|
2019-07-23 10:41:48 -07:00 |
|
omar
|
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.
|
2019-07-22 18:49:51 -07:00 |
|
omar
|
34cf00566f
|
InputTextMultiline: Fixed vertical scrolling tracking glitch.
Fixed Travis-CI banner address.
|
2019-07-22 18:11:06 -07:00 |
|
omar
|
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.
|
2019-07-22 11:02:44 -07:00 |
|
omar
|
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
|
2019-07-22 10:29:14 -07:00 |
|
omar
|
f0348ddffc
|
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. (#2677, #2005)
|
2019-07-21 18:39:50 -07:00 |
|
Aaron Cooper
|
0f86116a69
|
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
|
2019-07-21 18:29:11 -07:00 |
|
omar
|
c37f21788f
|
Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with other column functions + fixed Columns demo (#2683)
|
2019-07-21 11:23:15 -07:00 |
|
omar
|
9f35ba8546
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-19 15:19:10 -07:00 |
|
omar
|
b443bc0a64
|
Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. (#125, #2666)
|
2019-07-19 14:22:33 -07:00 |
|
omar
|
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().
|
2019-07-19 14:22:12 -07:00 |
|
omar
|
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.
|
2019-07-19 12:11:00 -07:00 |
|
omar
|
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.
|
2019-07-19 11:22:39 -07:00 |
|
omar
|
7fd34d4f30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-17 18:48:16 -07:00 |
|
omar
|
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)
|
2019-07-17 18:40:48 -07:00 |
|
omar
|
e28d20c3e2
|
Columns: Fixed a regression from 1.71 where the right-side of the contents rectangle within each column would wrongly use a WindowPadding.x instead of ItemSpacing.x like it always did. (#125, #2666)
|
2019-07-17 17:29:30 -07:00 |
|
omar
|
61c7f0194e
|
Misc: Made Button(), ColorButton() not trigger an "edited" event leading to IsItemDeactivatedAfterEdit() returning true. This also effectively make ColorEdit4() not incorrect trigger IsItemDeactivatedAfterEdit() when clicking the color button to open the picker popup. (#1875)
Demo: Added Button with repeater and InputFloat with +/- button to the status query test demo.
|
2019-07-17 17:10:28 -07:00 |
|
omar
|
1f3feb481e
|
Internals: Refactor: Moved all Columns code from imgui.cpp to imgui_widgets.cpp (#125)
Also moved NextColumn between BeginColumn and NextColumn which makes it easier to work on that code.
|
2019-07-17 17:10:27 -07:00 |
|
omar
|
bb2aa5e770
|
Docking: Making it possible to undock a node by clicking on the tab bar / title bar for the node. (#2645, #2109)
|
2019-07-17 13:55:00 -07:00 |
|
omar
|
56e10f1c35
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-07-16 18:29:31 -07:00 |
|
omar
|
e6a286b3a5
|
Style: Added style.ColorButtonButton (left/right, defaults to ImGuiDir_Right) to move the color button of ColorEdit3/ColorEdit4 functions to either side of the inputs.
|
2019-07-16 16:43:21 -07:00 |
|
omar
|
a35f42f123
|
Removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). (#581, #324)
|
2019-07-15 18:30:20 -07:00 |
|
omar
|
3d07c7cbe4
|
TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).
|
2019-07-15 18:30:20 -07:00 |
|
omar
|
7a9d32acee
|
Fixed unnecessary test in UpdateMouseWheel() (thanks PVS).
TreeNodeBehavior: avoid computing bg_col for non-framed non-active tree nodes.
Comments, binaries update, minor typos.
|
2019-07-15 18:30:20 -07:00 |
|
omar
|
3436132d4b
|
Combo: Hide arrow when there's not enough space even for the square button.
+ Various todo items.
|
2019-07-11 17:20:56 +02:00 |
|
omar
|
1f54c16f52
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-02 18:47:10 +02:00 |
|
omar
|
e16564e67a
|
Scrollbar: Avoid overlapping the opposite side when window (often a child window) is forcibly too small.
|
2019-07-01 20:59:00 +02:00 |
|
omar
|
2a3517a399
|
Internals: Checkbox: Added undocumented mixed/indeterminate/tristate support via ImGuiItemFlags_MixedValue. (#2644)
|
2019-06-30 12:03:09 +02:00 |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
e9b92d1cef
|
Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. (#2618)
+ Fix version number in imgui.h
|
2019-06-17 11:32:00 +02:00 |
|
omar
|
b27fd87177
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
2019-06-17 11:10:14 +02:00 |
|
omar
|
5286ecb8a7
|
Version 1.72 WIP
|
2019-06-14 11:58:58 +02:00 |
|
omar
|
d3d998a885
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2019-06-12 18:40:50 +02:00 |
|
omar
|
2da1c66d15
|
Version 1.71 + comments
|
2019-06-12 18:30:06 +02:00 |
|
omar
|
5ae268c0a3
|
Internals: Reworked RenderTextEllipsis() to satisfy what we need for table headers.
|
2019-06-11 16:12:00 +02:00 |
|
omar
|
c3a348aa25
|
CollapsingHeader: Minor fix to align right side of frames (which is extruded past the Work/Contents rect) with clipping rectangle.
|
2019-06-11 15:56:57 +02:00 |
|
omar
|
a8eb64fc54
|
Log/Capture: Fixed BeginTabItem() label not being included in a text log/capture.
Extracted tab rendering code into a RenderTextEllipsis() function.
|
2019-06-11 14:03:13 +02:00 |
|
omar
|
afa3978ff6
|
Internals: Added drawlist and color arg to RenderArrow(), RenderBullet(). Reordered args for RenderPixelEllipsis.
|
2019-06-07 17:32:51 +02:00 |
|
omar
|
63310acd58
|
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
|
2019-06-06 16:16:18 +02:00 |
|