# Conflicts:
#	imgui.cpp

# Conflicts:
#	imgui.cpp

# Conflicts:
#	imgui.cpp

…mesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)

…+ demo. (#261, #351)

…eting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.

…coming code (otherwise git gives us a messier patch).

…figFlags_DockingEnable. (Part 1) (#351)

# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

…ranch. Moved code in BeginTabItem().

…pace and window merging. Added DockSpace() flag ImGuiDockFlags_NoSplit. Renaming. Reworked the DockNodeUpdateFindOnlyNodeWithWindows code so DockNodeUpdate can access the first window.

…ked() will need to use it. Extracted some code into a DockNodeIsDropAllowedOne() function. Comments.

…being restoring focus properly after the main menu bar or last focused window is deactivated.

…ce() skips node update if already submitted (when transitioning from implicit -> explicit DockSpace).

…t_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

…t_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)

…ple level of tabs. (also renamed ImGuiDockFlags to ImGuiDockSpaceFlags.)

…es() to transfer the LastExplicitSize value (was inconsequential afaik).

…in particular would be noticeable when using nested tab bars.

… dock node not active.

…akenly destroying the platform window because the upcoming tab isn't visible and triggers viewport GC. Fixed missing title bar data on recreate window.

…hen viewport are disabled. Also made the DestroyPlatformWindow process more sturdy. (#1542)

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp

…nAppearing. (#1542), 2 doesn't seem enough with some docking setup.

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h

…ectively, so we can honor settings changes on a per Dockspace basis. + Comments

…ngs, which we don't need anymore.

…uently be used by other API it makes more sense to let the user compute it.

… branch + moved Docking related API together for now.

…it, affecting in particular with io.ConfigDockingWithKeyMod = false. + comments, asserts

… ImGuiContext* ctx parameter instead of ImGuiDockContext

…factor + assert fix. Probably broke something (but I haven't found what yet!)

…(not sure why I didn't do that before). Probably broke something subtle, will find out. *Edit* Initially broke restoring selected tab.

…ini data) + todo

…ockNode always triggering BeginAsDockableDragDropSource() when io.ConfigDockingWithKeyMod is false.

…apse button. Super useful and works great!

… in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.

…empty node in the docking tree. Fixed calls to MarkIniSettingsDirty().

# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp

…d node + reusing existing dock node when possible.

…rected to the first window of the docking node instead of the selected one.

…here non-child windows could be stick marked as not owning their viewport.

…xtracting a dock node from a split node owning its viewport will have both viewports be in the expected OS z-order. (The lower window re-use the exiting viewport, the detached node uses a new viewport:

…indows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)

…to an immovable parent window. + Tweak .ini output.

…ng/undocking dock node from CollapseButton.

…), allowing multiple scene to be tagged with their scene id and not receive tabs from other scene + persistent storage for family id to allow for docking tree fork/remap.

…GetWindowDockId().

…tomatic ID selection + TODO update and moved docking entries to docs/TODO.txt

…e to fork/copy entire layouts. This will probably need to be added to as I find ways to migrate patterns from user code to the library. Added IMGUI_DEBUG_DOCKING_INI helper to facilitate debugging. (+1 squashed commits)

…55dc6e)

# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp

…re unused trees.

…indowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().

…n-owned host viewport (leading to general havoc).

…erence leading to undesirable merging of nodes.

…n docking single window with a dock node into single window without dock node.

…d. + DockSpace() early out + comments.

…related code.

…root should be preserved.

…d windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another

…hift.

# Conflicts:
#	imgui.cpp

… the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)

…noring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. (#2109)

…xplanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)

…m a child window. Would typically affect calling SplitterBehavior() from a child window.

…mo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109)

…in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)

… cimgui generator. (#2115)

…t it is expected we transition it to be public facing. (#2109)

…ockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)

…tform decoration (#1542)

…tform decoration (#1542)

…the_frame block. This will be useful in the Docking branch.

…le buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate().

# Conflicts:
#	imgui.cpp

# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
#	imgui_internal.h

# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp