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
|
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 |