589 Commits (6ac50634e3b60b9378e1cedd0c0c55b9927d39a1)

Author SHA1 Message Date
omar 11f13ab24f Internal: renamed RenderTriangle() to RenderArrow(). 7 years ago
omar c994796e26 Internal: Moved IM_NEWLINE helper to imgui_internal.h 7 years ago
omar d98a5d54aa Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 2c9f45bbe7 Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787) 7 years ago
omar 735267d27c Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542) 7 years ago
omar 0e62b7d68a Clearing next window data at the end of Begin() more reliably. Misc comments. 7 years ago
omar a761779b12 Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis. 7 years ago
omar c7835dd189 ImRect: Removed misleading IsFinite() function used by some Nav code. 7 years ago
omar 27667fc035 TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079) 7 years ago
omar b28995b667 Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h (#1640) 7 years ago
omar b33f0e215f Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization. 7 years ago
omar 3b163ac35b Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.) 7 years ago
omar 7c16d52f72 Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787) 7 years ago
omar f0364aa359 Merge branch 'context'
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
7 years ago
omar 7e32fc7109 Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787) 7 years ago
omar cea8017e0b Merge branch 'master' into context 7 years ago
omar db071184a0 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
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. (#1597, #143) 7 years ago
omar e6926d9f7c Internals: Refactored bool LastItemRectHovered into flags. (#1597) 7 years ago
omar ce2b8d3255 Nav: Comments, removed extraneous parameter. 7 years ago
omar 0c0d811859 Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787) 7 years ago
omar e5e3cc617e Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId. 7 years ago
omar f35734c925 Nav: Debugging code. (#787) 7 years ago
omar 8ad88f725c Nav: Minor tidying up. (#787) 7 years ago
omar bed55a41e1 Internals: ImRect: Added IsInverted() helper. 7 years ago
omar e2654a097b ImRect: added IsInverted() helper. 7 years ago
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. (#787, #1079) 7 years ago
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. (#787) 7 years ago
omar 950f260a32 Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. (#787) 7 years ago
omar 79ff3c2d49 Merge branch 'master' into navigation 7 years ago
omar 07163804df Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h 7 years ago
omar fd6d8863f7 Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). (#787) 7 years ago
omar 8cc2dbc3bd Internals: Nav: Extracted code into IsWindowNavFocusable(). (#787) 7 years ago
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. (#787, vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows. 7 years ago
omar 27980d9688 Merge branch 'master' into context 7 years ago
omar c851b33352 Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787) 7 years ago
omar c8d8dc7f0a Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787) 7 years ago
omar 72485a5d04 Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. (#787) (+1 squashed commits)
+ store window inside result.
7 years ago
omar 1cf38d0334 Internals: Nav: Renamed ImGuiNavForward enum (#787) 7 years ago
omar 4654040bcb Nav: Comments, added enum to clarify NavForward code. (#787) 7 years ago
omar 3ded262776 Merge branch 'master' into navigation 7 years ago
omar 04d5783ffd Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787) 7 years ago
omar f2d5300408 Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787) 7 years ago
omar 8bf0c89c0d Internals: ImRect::Contains(ImRect&) include boundaries (whereas Contains(ImVec2) should not). 7 years ago
omar d404b93b6b Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments 7 years ago
omar f3776055d6 Merge branch 'master' into context 7 years ago
omar 28671aa821 Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787) 7 years ago
omar d500113f1d Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
7 years ago
omar 9a76fd30fd Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete. 7 years ago
omar db2ba13154 Internals: Exposed SetCurrentFont() in imgui_internal.h 7 years ago
omar 1acb155419 Internals: Moved unnecessary MovingWindowMoveId field. 7 years ago
omar 9edf211c0e Merge branch 'master' into navigation 7 years ago
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
(#1565, #586, #992, #1007, #1558)
7 years ago
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! (#939) 7 years ago
omar 8877622fa8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar c2ffce3e5a Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143) 7 years ago
omar cc15512bfc InputText: Minor tweak. 7 years ago
omar a221d253f3 Nav: Comment. 7 years ago
omar 472ba1394c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 28a76af185 Internal: DrawData: Tidying, renaming. 7 years ago
omar a77913054f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 1182174d81 Internals: DrawData: We don't need an intermediate layer for popups. 7 years ago
omar 038453258e Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse. 7 years ago
omar 061d8df033 MIssing IMGUI_API for a type with non-inline methods. 7 years ago
omar 06eef2ce6f Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy). 7 years ago
omar 514d30d8cd MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345. 7 years ago
omar db63e71f13 Internals: Exposed SetCurrentFont() in imgui_internal.h 7 years ago
omar 1493de4f81 Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper. 7 years ago
omar c85d7d6e49 Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787) 7 years ago
omar c9be7d7254 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 0a98202714 Nav: Standardized FIXME-NAV marker. 7 years ago
omar 16285603f2 Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless) 7 years ago
omar 919fc548ad Merge branch 'master' into navigation 7 years ago
omar 0cabd81071 Internals: Rect: Added ClipWillFull helper + comments on variations. 7 years ago
omar 92d75c44bc Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience. 7 years ago
omar 3f4eccf154 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
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(). (#1497, #1533) 7 years ago
omar deab2ab015 Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497) 7 years ago
omar 69ff65f054 Internals: Popup: Renaming fields. 7 years ago
omar 3678307cd9 Popup, Menus: Tweaks and comments. 7 years ago
omar 369189b675 Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion. 7 years ago
omar a34490239c Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch. 7 years ago
omar 95b773370f Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
7 years ago
omar 007f4034c9 Internals: Added LastActiveId, LastActiveIdTimer. (#1537) 7 years ago
omar 29c194b2a4 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 4fc9f44073 Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op. 7 years ago
omar b2ec0741f1 Internals: Settings api tweaks 7 years ago
omar 2b8224692e Merge branch 'master' into navigation 7 years ago
omar f9b2058d5a Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots). 7 years ago
omar 96ccc484f9 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar 3c6fbe0849 Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData. 7 years ago
omar 7fcbd45500 Internals: NextWindow: Renamed, moved functions to member. 7 years ago
omar e339949de1 Internals: NextWindow: Using ImGuiCond for consistency. 7 years ago
omar 04b44398eb Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied) 7 years ago
omar 7a15fc8de5 Merge branch 'master' into navigation 7 years ago
omar 6ec00a366a Internals: ImRect: Minor formatting tweaks. 7 years ago
omar fbf2435f38 Exposed IM_OFFSETOF() helper in imgui.h 7 years ago
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.
7 years ago
omar c4e6d622c1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar 49eed6e2d1 Version 1.54 WIP 7 years ago