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
|
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 |
|
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
|
835b50b773
|
Internals: Nav: Tweak NavUpdatePageUpPageDown() to make it more readable.
|
2019-07-22 17:27:41 -07:00 |
|
omar
|
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 |
|
omar
|
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 |
|
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
|
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 |
|
omar
|
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 |
|
omar
|
f1ba217a92
|
Internals: Extracted some code out of the NewFrame() function.
|
2019-07-21 12:13:44 -07:00 |
|
omar
|
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 |
|
omar
|
9f35ba8546
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-19 15:19:10 -07:00 |
|
ocornut
|
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 |
|
omar
|
7fd34d4f30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-17 18:48:16 -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
|
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 |
|
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
|
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 |
|
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
|
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
|
8bc6d976cb
|
Docking: Fixed using ImGuiDockNodeFlags_AutoHideTabBar with ConfigDockingTabBarOnSingleWindows. (#2109)
|
2019-07-15 14:17:01 -07:00 |
|
omar
|
dd80db87a6
|
Viewport: Added ImGuiViewportFlags_NoAutoMerge to prevent merging into host viewport in a per-window basis via the ImGuiWindowClass override mechanism. (#1542)
|
2019-07-15 13:35:21 -07:00 |
|
omar
|
71d20abbc3
|
Settings: Minor optimization to reduce calls in SettingsHandlerWindow_WriteAll.
|
2019-07-12 13:33:38 +02:00 |
|
omar
|
d52c6316c8
|
Renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).
|
2019-07-12 11:58:46 +02:00 |
|
omar
|
e66799f79a
|
Prefixed internal structs exposed in imgui.h with a fully qualified name to facilitate auto-generation with cimgui.
|
2019-07-12 11:54:22 +02:00 |
|
omar
|
1f54c16f52
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-02 18:47:10 +02:00 |
|
omar
|
54c49b5fb1
|
Window: Mouse wheel scrolling while hovering a child window is automatically forwarded to parent window if ScrollMax is zero on the scrolling axis. Also still case if ImGuiWindowFlags_NoScrollWithMouse is set (not new), but previously the forwarding
would be disabled if ImGuiWindowFlags_NoScrollbar was set on the child window, which is not the case any more (amend #1502, #1380).
|
2019-07-02 18:33:50 +02:00 |
|
omar
|
58c9f8a194
|
Misc: Added IMGUI_DISABLE_METRICS_WINDOW imconfig.h setting to explicitly compile out ShowMetricsWindow(). + Internals: Minor renaming.
|
2019-07-01 20:58:10 +02:00 |
|
omar
|
da29d77253
|
Added SetScrollXHere, SetScrollFromPosX: Changelog, demo, comments (#1580).
|
2019-07-01 12:15:53 +02:00 |
|
kevreco
|
caf119a982
|
Added 'SetScrollHereX' and 'SetScrollFromPosX' (#1580)
|
2019-07-01 12:15:48 +02:00 |
|
omar
|
a89f05a10e
|
Child windows inherit Hidden frames setting from parent more accurately, so HiddenFramesCannotSkipItems is honored by child windows.
|
2019-06-29 20:12:15 +02:00 |
|
omar
|
401e05147c
|
Internals: Moved CalcListClipping close to ImGuiListClipper code (no-op)
|
2019-06-29 20:11:03 +02:00 |
|
omar
|
82711251b6
|
Internals: ImGuiListClipper using absolute coordinate (instead of relative one). Minor no-op tweaks + ImDrawListSplitter assert
|
2019-06-29 20:10:55 +02:00 |
|
omar
|
4b95e7c2f3
|
Doc: Tweak and extra mention of AddCustomRectFontGlyph + made the example register two rectangles.
|
2019-06-26 12:15:32 +02:00 |
|
omar
|
50d421fa19
|
Docking: Fixed GetBackgroundDrawList(), GetForegroundDrawList() overwriting ImDrawList flags after clear, leading to the AllowVtxOffset flag not being cleared. (#2638)
|
2019-06-26 09:52:25 +02:00 |
|
omar
|
f563e1a504
|
Internals: Renamed GetFrontMostPopupModal() to GetTopMostPopupModal() to be consistent. Renamed other locals to follow that terminology.
|
2019-06-19 18:16:38 +02:00 |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
70fe409338
|
Window: Fixed InnerClipRect right-most coordinates using wrong padding setting (introduced in 1.71).
|
2019-06-18 10:58:03 +02:00 |
|
omar
|
ae2c9f7101
|
Internals: Columns: Poke into WorkRect and use them in the GetContentRegionMax() functions. This should be a no-op, but preparing us to transition toward using WorkRect instead of ContentRegionRect.
Removed one use of ContentsRegionRect.
|
2019-06-17 12:14:34 +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
|
ca43436cd3
|
Fix monitor dpi info not being copied to main viewport when multi-viewports are not enabled. (#2621, #1676) + Tweaks, short path in FindPlatformMonitorForRect().
|
2019-06-17 11:19:34 +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
|
af3080b81b
|
Removed redirecting functions/enums that were obsoleted in version 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME.
|
2019-06-14 12:05:00 +02:00 |
|
omar
|
5286ecb8a7
|
Version 1.72 WIP
|
2019-06-14 11:58:58 +02:00 |
|
omar
|
07d3083279
|
Docking: Fixed rendering of outer decoration happening on non-visible docked window (#2623, #2109). Revealed by 0770449. We are actually better than before now, as previously those would get unnecessarily get rendered into a hidden draw list.
|
2019-06-13 10:19:14 +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 |
|