Commit Graph

5907 Commits (13f718337ac4df2c66727e85174d48e9a91eabcf)
 

Author SHA1 Message Date
omar 9ce51ad9f6 Fix bad merge
omar a6f37287d8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 7ac5f11b29 Standardizing the casing/format of internal window names + Misc comments.
omar befc58771c Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
omar e998c7d3e3 Combo: Moved functions (untouched).
omar a5e9392140 Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
omar d9d231dc6b Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
omar 74f42baf3e Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
omar 541dfd7901 Combo: Comments + fixed missing lower window padding.
omar 9872297a84 Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
omar a4863e8084 Demo: Picker with palette demo supports drag and drop. (, )
omar 7bf85db6c4 Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ()
omar b6b940c8ee Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
# Conflicts:
#	imgui.cpp
omar e118239f69 IsItemHovered() comments ()
omar 553b0fcf8f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar ca0bb000ad Begin: Factored out a bit of code to CalcSizeContents()
omar f658edc72a Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
omar 45466a8cf9 Internals: BeginCombo() added dummy ImGuiComboFlags.
omar 97edd42fc0 Indent(), Unindent(): Allow passing negative values.
omar 7f2b9ea4c0 Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
omar 8dcc1a8a20 Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
omar e045eddd77 Minor tweaks. Using ImGuiAxis defines.
omar 92f7bd3605 Fixed 64-bit warnings.
omar cc2c023880 Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
omar e6215b6ca0 Merge branch 'master' into navigation + merge fix
# Conflicts:
#	imgui.cpp
omar 3c9f9a455e Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
omar 8959c64b33 Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
omar abe5ad3c7a Demo: Added display for IsMouseDragging() function.
omar 94bf12f14b Demo: Display better mouse cursor info for debugging backends.
omar 20c7aab60c Exposed GetOverlayDrawList(). (~#545, ~#530)
omar 6deb865f78 Nav: Merge fix.
omar 2fc6a82665 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 8f41508c52 Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
omar 2fc9a2e6e7 Fixed nav branch merge issue.
omar beda5fc5a0 Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
omar ecacaf7f2d Lower-right resize grip only appears when hovered. ()
omar 3b7e4eaf38 Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ()
omar 531e559e49 Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. () The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
omar e103fe8c1f Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ()
omar 90ae1c59c4 Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ()
omar fe2cf231a8
Update README.md
omar 729333293c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 0f119865a6 Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ()
omar 5686c72bbd Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. () The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
omar b9dc0caee3 Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ()
omar 2ca4f9e862 Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ()
omar 364251146b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 77d1a4b636 Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
omar 16d9fa30b2 Merge branch 'master' into drag_and_drop
omar 5f7cd7fb1c Internals: Splitter Behavior doesn't show a border. ()