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)
|
2018-01-29 23:59:46 +01:00 |
|
omar
|
c8d8dc7f0a
|
Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787)
|
2018-01-29 23:59:43 +01:00 |
|
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.
|
2018-01-29 23:59:42 +01:00 |
|
omar
|
1cf38d0334
|
Internals: Nav: Renamed ImGuiNavForward enum (#787)
|
2018-01-29 18:12:32 +01:00 |
|
omar
|
4654040bcb
|
Nav: Comments, added enum to clarify NavForward code. (#787)
|
2018-01-29 17:35:36 +01:00 |
|
omar
|
3ded262776
|
Merge branch 'master' into navigation
|
2018-01-26 16:07:43 +01:00 |
|
omar
|
04d5783ffd
|
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787)
|
2018-01-25 19:36:38 +01:00 |
|
omar
|
f2d5300408
|
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787)
|
2018-01-25 19:03:47 +01:00 |
|
omar
|
8bf0c89c0d
|
Internals: ImRect::Contains(ImRect&) include boundaries (whereas Contains(ImVec2) should not).
|
2018-01-25 14:24:57 +01:00 |
|
omar
|
d404b93b6b
|
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments
|
2018-01-24 19:57:39 +01:00 |
|
omar
|
28671aa821
|
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787)
|
2018-01-24 17:41:47 +01:00 |
|
omar
|
d500113f1d
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-01-23 19:16:43 +01:00 |
|
omar
|
9a76fd30fd
|
Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
|
2018-01-23 19:13:49 +01:00 |
|
omar
|
db2ba13154
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
2018-01-23 16:33:06 +01:00 |
|
omar
|
1acb155419
|
Internals: Moved unnecessary MovingWindowMoveId field.
|
2018-01-22 14:31:20 +01:00 |
|
omar
|
9edf211c0e
|
Merge branch 'master' into navigation
|
2018-01-21 20:46:50 +01:00 |
|
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)
|
2018-01-20 20:25:12 +01:00 |
|
omar
|
8877622fa8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-19 15:42:28 +01:00 |
|
omar
|
c2ffce3e5a
|
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143)
|
2018-01-18 17:39:40 +01:00 |
|
omar
|
cc15512bfc
|
InputText: Minor tweak.
|
2018-01-17 12:15:24 +01:00 |
|
omar
|
a221d253f3
|
Nav: Comment.
|
2018-01-15 20:13:49 +01:00 |
|
omar
|
472ba1394c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-15 20:13:42 +01:00 |
|
omar
|
28a76af185
|
Internal: DrawData: Tidying, renaming.
|
2018-01-15 20:12:48 +01:00 |
|
omar
|
a77913054f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-01-15 18:02:58 +01:00 |
|
omar
|
1182174d81
|
Internals: DrawData: We don't need an intermediate layer for popups.
|
2018-01-15 18:00:13 +01:00 |
|
omar
|
038453258e
|
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
061d8df033
|
MIssing IMGUI_API for a type with non-inline methods.
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
06eef2ce6f
|
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
514d30d8cd
|
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
|
2018-01-14 14:13:54 +01:00 |
|
omar
|
db63e71f13
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
2018-01-12 20:07:01 +01:00 |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
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)
|
2018-01-12 19:28:37 +01:00 |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-01-12 19:21:12 +01:00 |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
2018-01-12 19:13:15 +01:00 |
|
omar
|
16285603f2
|
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
|
2018-01-12 19:11:11 +01:00 |
|
omar
|
919fc548ad
|
Merge branch 'master' into navigation
|
2018-01-10 18:58:26 +01:00 |
|
omar
|
0cabd81071
|
Internals: Rect: Added ClipWillFull helper + comments on variations.
|
2018-01-10 14:43:08 +01:00 |
|
omar
|
92d75c44bc
|
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
|
2018-01-10 14:43:02 +01:00 |
|
omar
|
3f4eccf154
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-07 16:22:09 +01:00 |
|
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)
|
2018-01-07 16:20:02 +01:00 |
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
2018-01-07 16:15:54 +01:00 |
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
2018-01-07 16:11:25 +01:00 |
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
2018-01-07 15:56:14 +01:00 |
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
2018-01-07 15:40:46 +01:00 |
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
2018-01-07 14:03:56 +01:00 |
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
|
2018-01-05 17:40:51 +01:00 |
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
2018-01-05 15:33:24 +01:00 |
|
omar
|
29c194b2a4
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-03 20:47:42 +01:00 |
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
2018-01-03 20:46:54 +01:00 |
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
2018-01-03 20:45:17 +01:00 |
|