Commit Graph

2726 Commits (0d063585e89c558aa01f64b3b9f7e070f9b816ec)

Author SHA1 Message Date
omar 932d3f0198 NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. () + comments.
omar 7ccbb765e2 InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (, )
omar 2f15cc0855 Nav: Fixed popup wrap-around logic for windows with scrolling. ()
omar 05885b2e6d Merge fix.
omar 472ba1394c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 28a76af185 Internal: DrawData: Tidying, renaming.
omar a77913054f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 1182174d81 Internals: DrawData: We don't need an intermediate layer for popups.
omar 0c06b43e6b Metrics: Tweaks to hover-window-drawlist to see window bounding box.
omar 038453258e Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
omar 06eef2ce6f Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
omar 6eff21ee5e Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ()"
This reverts commit 03f5cd6ca1.
omar 514d30d8cd MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch .
Crunkle daa38f2ad0 Fix cross compilers
omar db63e71f13 Internals: Exposed SetCurrentFont() in imgui_internal.h
omar 1493de4f81 Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
omar c85d7d6e49 Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ()
omar c9be7d7254 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 0a98202714 Nav: Standardized FIXME-NAV marker.
omar cc173d7619 Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (, )
omar 5e9ae92ae9 Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (, )
omar f7b10fc954 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 6a1011cf53 MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref , )
omar b74f24c3e5 Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref , )"
This reverts commit 651538e13b.
omar 1c95dea88c Merge branch 'master' into navigation
omar 7d2a068dea Begin: Shuffling bits of code around.
omar cd7e178eac Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 651538e13b Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref , )
omar a63fbbca8b Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ()
omar 67671c0ab5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 1eee10778b Internals: Begin: Refactor some code into an UpdateManualResize() function.
omar 483f9b0d07 Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
omar 03f5cd6ca1 Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ()
omar 919fc548ad Merge branch 'master' into navigation
omar 6c583315e6 Begin: Moving some code around for the benefits of the wip viewport branch.
omar f610e25682 Internals: Using ImFloor().when appropriate.
omar fe919995da Merge branch 'master' into navigation
omar 933ee6cd5d InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). ()
omar fd4d63a0c5 InputText: Moved code for checking clipboard shortcut so we can expand on it. ()
omar 168200f915 Popups: Comments, reorganize bits of the header section, renamed parameters.
omar a8e5542d78 BeginPopup: Exposed extra_flags publicly. ()
omar 3f4eccf154 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 3fc7cf190d OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (, )
omar deab2ab015 Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). ()
omar 69ff65f054 Internals: Popup: Renaming fields.
omar 3678307cd9 Popup, Menus: Tweaks and comments.
omar 369189b675 Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
omar e09852fc49 Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
omar 63e4677b81 Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
omar c337cdcfd3 Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
omar 7ad169fa09 Merge branch 'master' into navigation + fix previous merge
# Conflicts:
#	imgui.cpp
omar d730a763f6 Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
omar 66b2ee6ea2 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar a34490239c Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
omar 5fd19f037f Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
omar 2874aabb93 Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
omar 95b773370f Revert "Internals: Added LastActiveId, LastActiveIdTimer. ()" Will come up with a better design later.
This reverts commit 007f4034c9.
omar 007f4034c9 Internals: Added LastActiveId, LastActiveIdTimer. ()
omar 29c194b2a4 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 4fc9f44073 Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
omar 4b1240b2e1 Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
omar b2ec0741f1 Internals: Settings api tweaks
omar 2b8224692e Merge branch 'master' into navigation
omar 0a0b252bb6 DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
omar 33f7769d85 Columns: Clear offsets data when columns count changed. ()
omar f9b2058d5a Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
omar 05ec0b0736 Casing tweaks + clarify license copyright (simpler/safer?) ()
omar 96ccc484f9 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar 3c6fbe0849 Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
omar 7fcbd45500 Internals: NextWindow: Renamed, moved functions to member.
omar e339949de1 Internals: NextWindow: Using ImGuiCond for consistency.
omar 04b44398eb Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
omar 7e03ee8d85 Merge branch 'master' into navigation
Cory McWilliams 561e9f286e Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
omar 170bcb2d7c Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
omar 7a15fc8de5 Merge branch 'master' into navigation
omar 2dd2ca0096 Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e.
omar c4e6d622c1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 4fbdb50dca MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
omar 4ba2e85744 Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
omar 90ff4ae5d1 BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
omar e985baa35d Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later)
omar 06bea369c0 DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
omar 563d04fdb1 TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. (, )
omar 49eed6e2d1 Version 1.54 WIP
omar 436cad4bca Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
omar d9034bf2d8 ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ()
omar e916310b2e Version 1.53
omar ed2105d4a2 Merge branch 'master' into navigation
omar 3849bb4470 Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
omar de5c304b49 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 8d54b1b7af Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
omar 1b86e7343f Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
omar cead207535 Comments
omar 6c63c7a8b1 Various zealous warning fixes (thanks Clang). (Navigation branch)
omar ffb4f6ca8c Merge branch 'master' into navigation
omar 9cda86d55a Internals: Added IM_NEW, IM_DELETE helper macros (, , )
omar 983d8f5f8e Various zealous warning fixes (Clang).
omar 53b24ff79a Removed reliance on ImU64 type for the ImDrawList assert. ()
omar 1f26652944 Various zealous warning fixes (thanks Clang).
omar 1c1e490316 Merge branch 'master' into navigation
omar 46dcd9aa50 Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ()
omar 471bcf8b5e Columns: Fixed dragging when using a same of columns multiple times in the frame. ()
omar e1a103b251 Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ()
omar 8d21ee56d2 ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ()
omar 287380261c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar c8c872c753 Internals: String functions uses size_t in their signature
omar 996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
omar d139bd088d Begin: Moved modal darkening draw block
omar 14cb8177d0 ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
omar 531c11d5c7 ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
omar 230f826ef5 ImDrawList: Comments
omar 4c2514dc29 Merge branch 'master' into navigation
omar 6193f46af2 Active Modal window always set the WantCaptureKeyboard flag ()
omar b366dd9322 BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
omar 55c0d2b9ab InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (, )
ibachar abaf347deb Added a flag for text input to disable undo / redo
omar b1d90b565d Columns: Fixed previous commit (wrong chunk commited) ()
omar b9391d1692 Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ()
omar 6497f5dc1b Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
omar 0c6e260f73 Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ()
omar 6effcf21d6 Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. ()
omar 51433e26af Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ()
omar eefea0588a Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (, )
Branimir Karadžić ac8e708c3e Fixed unused variable warning.
omar 45bca7851d Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ()
omar cc3192f347 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar f265e16b84 Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
This reverts commit 7ac1583411.
omar ddbcda8c1b Columns: Column width data is no longer lost while dragging toward the right side. (, )
omar ba71e1c0e4 Columns: Minor stylistic fixes. ()
omar f7c5f420e7 BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. ()
omar e8e84a6ad6 Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ()
omar 4ae5c7e227 Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (, )
omar b016215c80 Columns: Refactor: Not using statestorage lookup anymore. (, )
omar 3a31a75e3b Columns: Refactor: Renamed all members. (, )
omar 78320aa633 Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (, )
omar 027ffd91ea IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
omar 16fb58984f Merge branch 'master' into navigation
omar 90d0b8b58b Navigation: minor sync to reduce drifts between changes
omar 8b59ed0708 Drag and Drop: Exposed some internals.
omar 7c7a7baf76 Merged miscellaneous small stuff (from nav/dock branches).
omar b174fcc9af Added IsAnyWindowFocused() (from Nav branch).
omar fa9327ccf8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
omar d0a1be0de0 Merge branch 'drag_and_drop'
omar ab049c6fc0 Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
omar 7faa5b16bb Tweak
omar 3ea5e67ba2 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
omar 02e0a078f4 Begin: Tidying up code to make it more readable.
omar 28bbf1ade6 Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
omar d561a43a4d Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. ()
omar e98df91dc4 Drag and Drop: Added ImGuiCol_DragDropTarget (, )
omar 7ec934f439 Drag and Drop: Comments
omar 052b6021dd Merge branch 'master' into drag_and_drop
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
omar 0a3db267c3 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
omar 6190ab0084 Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
omar c22657985a Added GetFrameHeight() function (used to be SmallSquareSize internally)
omar ee7f1921e8 Internals: Added GetSmallSquareSize()
omar 08b72eb5c0 IsWindowFocused() refactor will flags. ()
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
omar c65124f415 Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
omar f42d7b89e2 Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
omar 4a555d35f0 IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ()
omar f93945540f Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. (, )
omar 45f440bb7d Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
omar 2b9d8ab91d Merge branch 'master' into drag_and_drop
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 38bfdb357e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 9fd15defe4 Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ()
omar d1db229907 Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar e3e0326ea9 Exposed BeginCombo() publicly.
omar eab6333a0b SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ()
omar 7ac1583411 Scrollbar: Minor simplication of the code using InnerRect data.
omar a9b01600ac Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
omar b75acc21b0 Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
omar f72b002da8 Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). (, , )
Branimir Karadžić e23083a080 Fixed warning: logical ‘and’ of equal expressions
omar 0365c524a2 ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ()
omar a8c7b1a2a2 ColorEdit4: Made IsItemActive() return true when picker popup is active. ()
omar 871a5cecc1 Merge branch 'master' into navigation
omar c9f0275e22 Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
omar 457011660e Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
omar a263dce2f2 Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
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 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.