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 |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
2018-01-03 20:26:24 +01:00 |
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
2018-01-03 14:35:11 +01:00 |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2018-01-03 12:33:27 +01:00 |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
2018-01-03 12:31:56 +01:00 |
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
2018-01-03 12:28:16 +01:00 |
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
2018-01-03 12:22:02 +01:00 |
|
omar
|
04b44398eb
|
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
|
2018-01-03 12:12:41 +01:00 |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
2017-12-29 18:28:23 +01:00 |
|
omar
|
6ec00a366a
|
Internals: ImRect: Minor formatting tweaks.
|
2017-12-29 18:28:04 +01:00 |
|
omar
|
fbf2435f38
|
Exposed IM_OFFSETOF() helper in imgui.h
|
2017-12-29 18:16:19 +01:00 |
|
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.
|
2017-12-29 17:59:13 +01:00 |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-29 13:39:07 +01:00 |
|
omar
|
49eed6e2d1
|
Version 1.54 WIP
|
2017-12-28 15:17:35 +01:00 |
|
omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-26 15:37:31 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
67191badc2
|
Merge branch 'master' into navigation
|
2017-12-23 23:10:41 +01:00 |
|
omar
|
bb8dfe4a34
|
Fixed incorrect IM_DELETE macro (9cda86d55a) (#1517, #484, #504)
|
2017-12-23 23:10:26 +01:00 |
|
omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
2017-12-23 16:27:48 +01:00 |
|
omar
|
9cda86d55a
|
Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
|
2017-12-23 16:24:33 +01:00 |
|
omar
|
1f26652944
|
Various zealous warning fixes (thanks Clang).
|
2017-12-23 14:07:03 +01:00 |
|
omar
|
287380261c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-21 19:55:21 +01:00 |
|
omar
|
c8c872c753
|
Internals: String functions uses size_t in their signature
|
2017-12-21 19:49:54 +01:00 |
|
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.
|
2017-12-21 18:52:34 +01:00 |
|
omar
|
4c2514dc29
|
Merge branch 'master' into navigation
|
2017-12-21 11:18:42 +01:00 |
|
omar
|
b9391d1692
|
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
|
2017-12-15 17:06:47 +01:00 |
|
omar
|
cc3192f347
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-12-13 22:09:08 +01:00 |
|
omar
|
ddbcda8c1b
|
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
|
2017-12-13 21:51:23 +01:00 |
|
omar
|
e8e84a6ad6
|
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
|
2017-12-13 19:26:04 +01:00 |
|
omar
|
4ae5c7e227
|
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)
|
2017-12-13 19:21:21 +01:00 |
|
omar
|
b016215c80
|
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
|
2017-12-13 19:07:09 +01:00 |
|
omar
|
3a31a75e3b
|
Columns: Refactor: Renamed all members. (#125, #1499)
|
2017-12-13 18:42:06 +01:00 |
|
omar
|
78320aa633
|
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
|
2017-12-13 18:41:51 +01:00 |
|
omar
|
16fb58984f
|
Merge branch 'master' into navigation
|
2017-12-12 23:41:48 +01:00 |
|
omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
2017-12-12 23:41:20 +01:00 |
|
omar
|
8b59ed0708
|
Drag and Drop: Exposed some internals.
|
2017-12-12 23:37:27 +01:00 |
|
omar
|
7c7a7baf76
|
Merged miscellaneous small stuff (from nav/dock branches).
|
2017-12-12 23:36:25 +01:00 |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2017-12-12 20:44:12 +01:00 |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
2017-12-12 20:39:52 +01:00 |
|