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

Ocornut master (24/07) #4

Merged
merged 270 commits into from
Jul 24, 2024
Merged

Ocornut master (24/07) #4

merged 270 commits into from
Jul 24, 2024

Conversation

Ciachociech
Copy link
Owner

(Click "Preview" to turn any http URL into a clickable link)

  1. PLEASE CAREFULLY READ: Contributing Guidelines

  2. Clear this template before submitting your PR.

ocornut and others added 30 commits June 6, 2024 17:45
… type to ImGuiStoragePair (simpler for many languages).
… + rearrange child/popup/tooltips section.

Because upcoming rework of ImGuiSelectionBasicStorage will want to do a lower bound on a span.
…lags_HasMouseCursors is not set by backend.

Amend 42bf149
… ImGuiCol_TabUnfocused -> ImGuiCol_TabDimmed, ImGuiCol_TabUnfocusedActive -> ImGuiCol_TabDimmedSelected.

Amend ocornut#261, ocornut#351
…ol_TabSelectedOverline, ImGuiCol_TabDimmedSelectedOverline.
… last payload frame instead of last drag source frame.
…uiDragDropFlags_PayloadNoCrossProcess flags.
…compositor drag and drop propagation.

# Conflicts:
#	imgui.cpp
#	imgui_internal.h
ocornut and others added 28 commits July 18, 2024 18:19
…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.
…. 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.
…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.
…oesn't parse 64-bits hex value as ImGuiID lookups.
… table occupied size. (ocornut#7543)

See "layout_group_endtable" test.
@Ciachociech Ciachociech changed the title Ocornut master Ocornut master (24/07) Jul 24, 2024
@Ciachociech Ciachociech merged commit 6ed5aa9 into master Jul 24, 2024
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.