Merge docking into Master #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o ImGuiWindowClass. (Could probably do something similar with TabBarFlagsOverrideSet+Clear for ocornut#2700 later.)
…ornut#2771) Later to lead into ocornut#2700 and ocornut#2539 Move tab submission block above in DockNodeUpdateTabBar(), not strictly necessary for this change as is, but useful if needing to apply override for TitleBg* as we'd need a value for node->VisibleWindow earlier than currently set.
# Conflicts: # docs/CHANGELOG.txt # imgui.cpp
…izing secondary viewport (ocornut#3766, ocornut#3758) Cannot repro here but appears to a user on Linux. Fix may be not super solid.
# Conflicts: # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp
…windows (ocornut#3716) Amended by @ocornut with same fix in DockBuilderRemoveNodeChildNodes().
…hruCentralNode touching the edge of a viewport. (ocornut#3733)
…now pretty much unused and duplicate (and misleading as we will evolve the concept) Use GetMainViewport() if stuck.
…art of viewport interface to master.
…essary casts of ImGuiViewportP* Metrics: readded root Drawlists node in metrics to match master. The (void*) casts are implying const-casst but currently left GetMainViewport() as returning non-const.
…t fields -> WorkPos, WorkSize before exposing in master branch.
# Conflicts: # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # imgui.cpp # imgui.h
…ct() consistent with clamped WorkSize.
…e of a few viewport structures in master
…created. (ocornut#3734) + Metrics updates. Revert 6bc5266 Showing inferred order and missing flags in metrics.
…ing code for new ImGuiViewportFlags values) # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h # imgui_widgets.cpp
…rnut#3789, ocornut#1542, ocornut#3680, ocornut#3350, ocornut#3012, ocornut#2471) Amend the merging of f14042c (merge ee59d7a)
# Conflicts: # docs/CHANGELOG.txt
… no docked window have a close button or it is disabled on the node, the space is given to tabs. Clarified close_button_is_visible vs close_button_is_enabled behavior in DockNodeUpdateTabBar().. (ocornut#3633, ocornut#3521) Reduced alpha of disabled close button a little bit further. Removed 'EnableCloseButton' which was actually unused (can't be infered early, need ->VisibleWindow anyway, which is not == ->ActiveWindow)
# Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # imgui.cpp
…Docking/Viewports part of Changelog (e.g. removed bits that are now already in master, clarified some added bits)
…s for specified number of frames.
# Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp
# Conflicts: # imgui.cpp # imgui_widgets.cpp
…>RootWindow. Why? So by default RootWindow matches user expectation on both branches, and RootWindowDockTree is more intentful. (Actually should reduce diff between master<>docking)
# Conflicts: # imgui.cpp
… into tab bar. Windows were not moved correctly. (ocornut#5515)
…ible items. (ocornut#5515, amend b16f738 ocornut#2700, ocornut#2539) Commit b16f738 left us with a "current" channel 0 which seems inadequate. Undoing that, assuming default is always 1, code filling bg color does a switch. Only DockContextEndFrame() leave it at 0 and it's not particularly necessary.
…to become unresponsive. (ocornut#5503) Amend 67be485, Somehow ties to 58f5092 + 0eb45a0 (ocornut#4310) Unsure of exact chain of event but this caused a parent link msimatch between the time of the MouseMoving test in AddUpdateViewport() setting _NoInputs on the wrong parent., and the release clearing _NoInputs on the rght one.
# Conflicts: # imgui.cpp
…cornut#5515) The idea is that in the absence of a tab bar, as new one gets created new tabs will be sorted based on window->DockOrder so this may work but we're not 100% sure.
…ing() to facilitate test engine (un)docking nodes before they are split out to their own window. Metrics: Display dock_node->Windows in node metrics.
… clarify that it isn't usable for much other than debugging.
# Conflicts: # backends/imgui_impl_metal.mm # imgui.cpp # imgui_internal.h
…avEnableKeyboard (ocornut#5504, ocornut#4023);
…window/cell boundaries. (ocornut#5548) This incorrect pattern has been mentioned or suggested in: ocornut#4510, ocornut#3355, ocornut#1760, ocornut#1490, ocornut#4152, ocornut#150 # Conflicts: # imgui.cpp
# Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h
# Conflicts: # examples/imgui_examples.sln # imgui.cpp # imgui.h # imgui_demo.cpp
# Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp
# Conflicts: # backends/imgui_impl_sdl.cpp # imgui_demo.cpp
…ornut#4468, ocornut#4825, ocornut#4832, ocornut#5127, ocornut#5655, ocornut#5709) # Conflicts: # backends/imgui_impl_opengl3.cpp
# Conflicts: # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_win32.cpp
…ilter duplicate, add to debug log.
…ws with no close button. [changes for docking] (ocornut#5745) + TabBar: starts displaying the unsaved document marker with a frame delay to match how close button is processed, otherwise the transition would be noticeable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge docking into Master