|
|
d057550209
|
Fixed Clang 8.0 warning "empty expression statement has no effect; remove unnecessary ';' to silence this" warning [-Wextra-semi-stmt]
+ Comment
|
2019-07-24 17:07:05 -07:00 |
|
|
|
e5b905481d
|
Viewport: Refactored ViewportFlagsOverrideMask+ViewportFlagsOverrideValue into ViewportFlagsOverrideSet+ViewportFlagsOverrideClear which appears easier to grasp. (#1542)
(cherry picked from commit 9437630872e7ca19065bee78fcafaab54a0d5bf2)
|
2019-07-24 13:45:18 -07:00 |
|
|
|
7c183dc6a1
|
Docking: Explicitly inhibit constraint when docked for now (#2690, #2109)
Added asserts to catch issues.
|
2019-07-24 11:18:13 -07:00 |
|
|
|
7fbd72b735
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-23 21:40:57 -07:00 |
|
|
|
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 |
|
|
|
969278fc0b
|
Docking: Fixed dragging/resizing from OS decoration not marking settings as dirty.
Internals: Added IMGUI_DEBUG_LOG_DOCKING, IMGUI_DEBUG_LOG_VIEWPORT macros to easily enable/disable a bunch of logging code.
|
2019-07-23 21:29:43 -07:00 |
|
|
|
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 |
|
|
|
81b24bd728
|
Docking: Moving types in imgui.h
|
2019-07-23 13:37:52 -07:00 |
|
|
|
db2581bee9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-23 13:35:01 -07:00 |
|
|
|
baae057a03
|
Internals: Merge in minor noise from wip Tables branch to simplify further merging.
|
2019-07-23 13:28:36 -07:00 |
|
|
|
51853292cc
|
ImDrawList: Using ImDrawCornerFlags instead of int in various apis.
Demo: Using ImGuiColorEditrFlags instead of int.
|
2019-07-23 10:41:48 -07:00 |
|
|
|
1820aaf444
|
imgui_freetype: Initialize FT_MemoryRec_ struct manually (#2686)
This fixes gcc warning: missing field 'alloc' initializer [-Wmissing-field-initializers]
|
2019-07-23 09:41:27 -07:00 |
|
|
|
26f14e056c
|
Scrolling: Made mouse-wheel scrolling lock the underlying window until the mouse is moved again or until a short delay expires (2 seconds). This allow uninterrupted scroll even if child windows are passing under the mouse cursor. (#2604)
|
2019-07-22 18:49:52 -07:00 |
|
|
|
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 |
|
|
|
34cf00566f
|
InputTextMultiline: Fixed vertical scrolling tracking glitch.
Fixed Travis-CI banner address.
|
2019-07-22 18:11:06 -07:00 |
|
|
|
835b50b773
|
Internals: Nav: Tweak NavUpdatePageUpPageDown() to make it more readable.
|
2019-07-22 17:27:41 -07:00 |
|
|
|
75136d3bea
|
Internals: Removed ShowDockingDemo(), moved into Metrics. Metrics: Added more links to browse window->node, node->window, node->node etc.
|
2019-07-22 11:51:04 -07:00 |
|
|
|
0e6a096afd
|
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. (#2109)
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
|
2019-07-22 11:29:22 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
363d33f64e
|
Increased IMGUI_VERSION_NUM to facilitate transition of OSX clipboard support for framework using/embedding any version of imgui. Amend 29d9394. (#2546)
|
2019-07-22 10:23:27 -07:00 |
|
|
|
cbd5a21fb0
|
Backends: DX10/DX11: Backup, clear and restore Geometry Shader is any is bound when calling renderer.
Backends: DX11: Clear Hull Shader, Domain Shader, Compute Shader before rendering. Not backing/restoring them.
|
2019-07-21 19:26:13 -07:00 |
|
|
|
29d9394a41
|
OSX: Disabled default native Mac clipboard copy/paste implementation in core library (added in 1.71), because it needs application to be linked with '-framework ApplicationServices'. It can be explicitly enabled back by using '#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS' in imconfig.h. Re-added equivalent using NSPasteboard api in the imgui_impl_osx.mm experimental back-end. (#2546)
|
2019-07-21 19:06:07 -07:00 |
|
|
|
f0348ddffc
|
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. (#2677, #2005)
|
2019-07-21 18:39:50 -07:00 |
|
|
|
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 |
|
|
|
4b44f25c9a
|
Fixed incorrect application of io.DisplaySafeAreaPadding which would be problematic with multi-viewports when a monitor uses negative coordinates (correct clamping is done right below). (#2674)
|
2019-07-21 18:19:56 -07:00 |
|
|
|
f1ba217a92
|
Internals: Extracted some code out of the NewFrame() function.
|
2019-07-21 12:13:44 -07:00 |
|
|
|
47f5ad32b7
|
Perform simple check: error if Docking or Viewport are enabled _exactly_ on frame 1 (instead of frame 0 or later), which is a common error leading to loss of .ini data. (#2109)
|
2019-07-21 12:05:04 -07:00 |
|
|
|
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 |
|
|
|
9f35ba8546
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-19 15:19:10 -07:00 |
|
|
|
b443bc0a64
|
Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. (#125, #2666)
|
2019-07-19 14:22:33 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
047dc16af5
|
Debug Tools: Added DebugStartItemPicker() in imgui_internal.h to facilitate binding this anywhere in user's tool. Adedd highlight. Added IMGUI_DEBUG_TOOL_ITEM_PICKER_EX to break in ItemAdd().
|
2019-07-19 11:28:03 -07:00 |
|
|
|
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 |
|
|
|
7fd34d4f30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-17 18:48:16 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ea79992d9a
|
Fixed old SetWindowFontScale() api value from not being inherited by child window. Added comments about the right way to scale your UI (load a font at the right side, rebuild atlas, scale style).
+ Added missing IMGUI_API marker to the EmptyString storage used by ImGuiTextBuffer. (#2672)
|
2019-07-17 10:01:49 -07:00 |
|
|
|
56e10f1c35
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-07-16 18:29:31 -07:00 |
|
|
|
130b44994e
|
Debug, Metrics: Added "Tools->Item Picker" tool which allow clicking on a widget to break in the debugger within the item code. The tool calls IM_DEBUG_BREAK() which can be redefined in imconfig.h if needed.
|
2019-07-16 18:25:49 -07:00 |
|
|
|
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 |
|
|
|
718e15c7de
|
Docking: Fix so that an appearing window making a dock node reappear won't have a zero-size on its first frame (because dock node ->Size was 0.0 unlike ->SizeRef) (#2109)
Docking: Added ImGuiDockNode to .natvis file.
|
2019-07-16 11:45:52 -07:00 |
|
|
|
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 |
|
|
|
3d07c7cbe4
|
TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).
|
2019-07-15 18:30:20 -07:00 |
|
|
|
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 |
|
|
|
8bc6d976cb
|
Docking: Fixed using ImGuiDockNodeFlags_AutoHideTabBar with ConfigDockingTabBarOnSingleWindows. (#2109)
|
2019-07-15 14:17:01 -07:00 |
|
