Skip to content

[pull] master from ocornut:master - #10

Open
pull[bot] wants to merge 2211 commits into
TeamREPENTOGON:masterfrom
ocornut:master
Open

[pull] master from ocornut:master#10
pull[bot] wants to merge 2211 commits into
TeamREPENTOGON:masterfrom
ocornut:master

Conversation

@pull

@pull pull Bot commented Mar 30, 2024

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

ocornut and others added 20 commits April 13, 2026 14:11
…lipRect().

While not currently a problem, it would be if ImRect::Overlaps() is changed to use <= instead of < (cc: #3976 which deal with Contains but sort of similar topic).
Changing ImDrawList::PushClipRect()'s intersect_with_current_clip_rect path to use ClipRectFull() would also fix this, but it may ambiguous there which behavior would be correct.
Amend 1ec464e.
…t font with an implicit size, as scale factor are likely erroneous. (#9361)
…en bufferCache is replaced by a new object while being used for synchronize(). (#9367)

This also removes the dispatch onto main when adding the finished buffers back into the cache. This operation should be fine to run on any thread as long as it's inside the sync block.
…pRect is active. (#7994, #8250)

Amend 6ce4b44 + bbd0af7. This probably should be redesigned to be more generic, e.g. move UnclipRect concept outside of Boxselect.
… a minimum of 1.0f, as some Linux setup seems to report <1.0f value and this breaks scaling border size. (#9369)
…e causing column width measurement to be invalid when trailing column contents is not submitted in the last row. (#9341, #8250)
…since enforce table layout in BeginMultiSelect(). (#7970, #7821).
…+ use in ImGuiMultiSelectFlags_BoxSelect1d mode when needed (e.g. wheel scrolling up). (#7994, #8250, #7821, #7850, #7970)
…s. (#8364)

- IsFocused scan nav focus route.
- When covering multiple windows, draw in front most ones (grabbed FindFrontMostVisibleChildWindow() from docking branch).
…ScreenPos() call when no items. Would not manifest because BeginMultiSelect() altered CursorMaxPos. (#5548)

cc: 2819ab3, edcd5b1
…rtical offset in the Header row. (#8250, #7994)

Because BeginMultiSelect() does `ms->ScopeRectMin = window->DC.CursorMaxPos = window->DC.CursorPos` at a time where CursorPos is already past MaxPos.y because of ItemSpacing.y. Accumulate spacing.
…ith items straying out of columns. (#7994, #2221)

Use 00d3f92.
+ Assets Browser toggle to enable ScrollX.
…ection columns with items straying out of columns. (#7994, #2221)
ocornut and others added 30 commits July 30, 2026 16:03
…essedFontDataProggyForever() undocumented non-static. (#9493)
…pixel when vertical ones are not also enabled.

Attributed to thedmd who reported this to me.
…viously Ctrl+Clicked field would flick it to text edit mode for a frame. (#9476, #701)
If running before DisplaySize is set, assume a different default on Apple.
…ed ImDrawList::_SetPixelDensity(). Reword FontRasterizerDensity as CurrentPixelDensity.

Amend 94a4322.

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
…ved .use files. (#9492)

Moved functions in example_qnx_opengl3/main.cpp to match structure of other examples.
…ers + made BeginChildEx() itself read from them. (#9503, #8280, #9412, #9499, #9393, #8488)

As a result BeginTable() doesn't need to read itself and pass that to BeginChildEx().
Example is precisely to demonstrate OpenGL.
…roperly reset every frame when cumulated session time is very large. (#9521)

Using a FrameCount for compare. Kept time as float to be consistent with other GC-related timestamps: if there is an actual need to use double we'll switch everywhere.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.