Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating docking branch #6

Merged
merged 1,010 commits into from
Oct 11, 2024
Merged

Updating docking branch #6

merged 1,010 commits into from
Oct 11, 2024

Conversation

enriavil1
Copy link
Owner

No description provided.

ocornut and others added 30 commits July 18, 2024 18:19
Checkbox() was reworked in master effectively fixing render clipping when culled by BoxSelect2d's UnclipMode.
…oid nav interference, much like most drag operations.
This avoid remove a one-frame delay when finishing box-select, where Esc wouldn't be routed to selection but to child.
…ion amounts in larger sets + fix caling batch select with same value.
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
…. Tidying up index.

+ change ExampleTreeNode::UID from ImGuiID to int to not suggest that the user ID needs to be of a certain type
…aving to interpolate between two ImGuiSelectionUserData.
…37, #2620, #2891, #3370, #3724, #4828, #5108, #5242, #5641)
# Conflicts:
#	imgui_demo.cpp
…sing focused item when within a child window using ImGuiChildFlags_NavFlattened.

In essence, using ImGuiFocusRequestFlags_RestoreFocusedChild here is a way to reduce changes caused by FocusWindow(), but it could be done more neatly.
See amended "nav_flattened" test.
# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
…oesn't parse 64-bits hex value as ImGuiID lookups.
ocornut and others added 23 commits October 3, 2024 11:18
# Conflicts:
#	imgui.cpp
# Conflicts:
#	imgui.cpp
…st'. Avoid using 'ctx'.

This is likely to trigger merging issues. If it does, best to always get "theirs" and rename in there.
…er state usable for callbacks. (#6969, #5834, #7468, #3590)
…t texture sampler to Clamp instead of Repeat/Wrap. (#7468, #7511, #5999, #5502)
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.h
* added the setting of glfw and handle systems without input

* off

* ops
@enriavil1 enriavil1 force-pushed the updating-docking-branch branch from 0e8a7db to 2e608f0 Compare October 11, 2024 15:23
@enriavil1 enriavil1 merged commit 1d7340a into docking Oct 11, 2024
12 checks passed
@enriavil1 enriavil1 deleted the updating-docking-branch branch October 11, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.