Commit Graph

3006 Commits (7268c65d73c3024853fb8b1e99c23eafc12e35f4)

Author SHA1 Message Date
omar 7e32fc7109 Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ()
omar ed4bbc4fd4 Nav: Comments, guides.
omar cea8017e0b Merge branch 'master' into context
omar db071184a0 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar b50dce54ea Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (, )
omar c6ba7c8231 Internals: TreeNode: Renaming local to be more consistent with other widgets.
omar e6926d9f7c Internals: Refactored bool LastItemRectHovered into flags. ()
omar ce2b8d3255 Nav: Comments, removed extraneous parameter.
omar 0c0d811859 Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. ()
omar fb9fecea5e Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. ()
omar 4932303e62 Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
omar e5e3cc617e Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
omar fb7cf4a475 Nav: Removed old unnecessary ifdefs.
omar f35734c925 Nav: Debugging code. ()
omar 92ee6b1185 Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. ()
omar 348c46d21e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 11d0fc8220 Tooltip: BeginTooltip() sets NoInputs flag.
omar 1dedbf8091 Style: Fixed missing style.MouseCursorScale initialization (), messed up original commit badly.
omar 533fe8cb55 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 8ad88f725c Nav: Minor tidying up. ()
omar 3f297e74e4 Merging the minor/shallow changes from Navigation branch.
omar 2081fc15b5 Added assert in BeginChild(ImGuiId id).
omar 223be68d77 Nav: Debugging stuff.
omar 66ff820eaa Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. ()
omar 0bd15b52a6 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 147ec8d1e2 Style Added style.MouseCursorScale, may remove ().
omar 648de2fc00 Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. (, )
omar ce9d7baaba Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (, )
omar 9120938200 Nav: Revert 5c9ea4d53a with comments. ()
omar 96ddfbc973 Nav: Modal windows can't be closed with Nav PadCancel. ()
omar efbd8cebe7 Nav: Comments ()
omar c4fc879508 CloseButton: Fixed cross positioning.
omar 942c140710 CloseButton: Fixed cross positioning.
omar 68d3e139a7 Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. ()
omar 950f260a32 Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. ()
omar c7b7b181b5 Nav: CloseButton reacts when clipped. ()
omar 5c9ea4d53a Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. ()
omar eb737e0a42 Nav: Child window is restored on focus follow up. Fix bdd868704f. (, ~#727) One visible issue was pressing Left to leave a child menu.
omar 95f9c74b9a Metrics: Displaying some of the important internal window flags.
omar 79ff3c2d49 Merge branch 'master' into navigation
omar 07163804df Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h
omar 5812d0b751 Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. ()
omar fd6d8863f7 Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). ()
omar ef2c3bcdee Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). ()
omar 8cc2dbc3bd Internals: Nav: Extracted code into IsWindowNavFocusable(). ()
omar bdd868704f Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. (, vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows.
omar 7b22a91578 Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. ()
omar eaa6f490a2 Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar 9bc5c089b6 Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point.
omar 76d8af4036 Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. ()
omar aa2dda7610 Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.
omar e6c0b212e8 Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. ()
NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928
omar 9c8fb804ed Log: Comments and extraneous assets to clarify intent. ()
omar 27980d9688 Merge branch 'master' into context
omar 47e81a6194 Merge branch 'master' into navigation
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ()
omar 23c11e9764 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 596b6d6de2 Style: Enable window border by default. ()
omar bebe03db05 Metrics: Minor formatting tweaks
omar bd579e5429 Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (). NavActive takes account of NavFlags enable flags.
omar 9fc6f5907b Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. ()
omar 1ed7bce3ed Nav: Removed old unused code. ()
omar a8763d14c5 Internals: Renaming.
omar 38197a236d Internals: Renaming.
omar a7ad5134e5 Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. ()
omar acf21ee429 Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. ()
omar bed6ef03f5 Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. ()
omar c851b33352 Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ()
omar b40dc5c4f2 Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. ()
omar 020b153d35 Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. ()
omar c8d8dc7f0a Nav: Internals: Renamed RootNavWindow to NavRootWindow ()
omar 72485a5d04 Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. () (+1 squashed commits)
+ store window inside result.
omar 1cf38d0334 Internals: Nav: Renamed ImGuiNavForward enum ()
omar 4654040bcb Nav: Comments, added enum to clarify NavForward code. ()
omar c8b9b2c6bd Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. ()
omar 21771adb94 Nav: Debug overlay uses default font. ()
omar 3ded262776 Merge branch 'master' into navigation
omar 2d9d7a10ca Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. () Looks like a bug introduced in c36e586cce.
omar 1f3b66b10a Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 () tho at the time it is possible that SizeContents wasn't calculated as evenly.
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
omar 10a4a77b27 Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. ()
omar 04d5783ffd Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. ()
omar d088bd86ad Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. ()
omar 486f0a8ba0 Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)
omar f2d5300408 Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ()
omar ed088b00be Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (, )
omar e9070e768e Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ()
omar 5d31e1696f Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. ()
omar 5f7f27c8de Nav: Comments. ()
omar d404b93b6b Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. () + comments
omar 89b0ca1f8f Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. ()
omar f3776055d6 Merge branch 'master' into context
omar 455989b8b1 Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ()
omar 28671aa821 Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. ()
omar 8227176c17 Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). ()
omar c09016b12a Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. ()
omar bd278e958e Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ()
ocornut 680162eb32 Merge branch 'master' into navigation
omar 5148937d4d Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (, )
omar 37ee99983f Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd ()
omar 64b786c2aa Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) ()
Note that this bit include badly hardcoded sizes, expecting an improvement later.
omar cea78cc576 Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. ()
omar eb7ec781dc Nav: Tweak GetNavInputAmount(). Split debug defines.
omar f6ee8d30fb Comments ()
omar d500113f1d Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
omar 9a76fd30fd Added SetNextWindowBgAlpha() helper. () particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
omar 13c407591e Nav: Comments, tweaks
omar db2ba13154 Internals: Exposed SetCurrentFont() in imgui_internal.h
omar 9076366c17 Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ()
omar 1acb155419 Internals: Moved unnecessary MovingWindowMoveId field.
omar 5097368bd5 Tweaked FAQ.
omar 2026e792cd Context: NewFrame() asserts ()
omar 9edf211c0e Merge branch 'master' into navigation
omar 3ed2ddbfbe Metrics: Removed context size display.
omar 5e2aa6185c Reorganized context handling to be more explicit,
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(, , , , )
omar 7e4d28a49d Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (, , , , )
omar e45d7a7060 Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (, , , , )
omar 5a301c29dc Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (, , , , )
omar ac5b7a1bdf Comments
Panos Karabelas 7c8a19978d Simplified return of ImGui::IsKeyReleased()
omar cd1409f4bf ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ()
omar 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ()
omar 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
omar d4bf9b4686 Renaming for consistency.
omar 8877622fa8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar e5a6e85f6d Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. ()
omar 42a612d7c9 Begin: Removed asserts that got in the way of some flags combination. ()
omar 0978f00911 MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for as the RootWindow for Child+Tooltip window points to itself now.
omar 74dc70c543 DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. ()
omar 63d47e8328 Drag and Drop: Increased payload type string to 12 characters instead of 8.()
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.
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 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 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. ()