|
|
33b88a0339
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-02 18:55:36 +02:00 |
|
|
|
e623be998d
|
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143)
|
2018-10-01 15:53:18 +02:00 |
|
|
|
9aae21483a
|
Fix missing IMGUI_API and mismatching namespace internal's CreateNewWindowSettings (#2105)
|
2018-09-27 12:59:22 +02:00 |
|
|
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
|
|
61d94ff88e
|
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
|
2018-09-26 21:30:37 +02:00 |
|
|
|
a7d3ae8937
|
BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698, #894, #713) + reworked the Begin/BeginChild comments in imgui.h.
|
2018-09-26 21:24:42 +02:00 |
|
|
|
781a7950d7
|
ImVector: Fixed a oddly unqualified return type in the assignment operator (I assume C++ handles it nicely as this never warned anywhere, but it is completely unintentional).
|
2018-09-24 11:33:26 +02:00 |
|
|
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
|
|
201fcfd2e5
|
Internals: Replace unsigned short with ImWchar when dealing with character storage. (#2078)
|
2018-09-11 22:00:57 +02:00 |
|
|
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|
|
|
eb7033e75b
|
Version 1.66 WIP
|
2018-09-06 21:44:59 +02:00 |
|
|
|
b974fffea0
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-09-06 15:59:35 +02:00 |
|
|
|
e0cab5664a
|
Version 1.65
|
2018-09-06 15:58:58 +02:00 |
|
|
|
8601c39571
|
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)
|
2018-09-05 17:50:55 +02:00 |
|
|
|
af27ec296b
|
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-09-05 17:38:47 +02:00 |
|
|
|
65876f348a
|
Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787)
|
2018-09-05 17:33:00 +02:00 |
|
|
|
77ba883f23
|
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.
|
2018-09-05 17:29:47 +02:00 |
|
|
|
bbcc976739
|
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
|
2018-09-05 17:29:47 +02:00 |
|
|
|
b944aa623c
|
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
|
2018-09-05 11:52:48 +02:00 |
|
|
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
2018-09-05 11:51:45 +02:00 |
|
|
|
bdb30d7145
|
Merge branch 'master' into viewport
|
2018-09-05 11:08:57 +02:00 |
|
|
|
bcb1441ce7
|
Version 1.65 WIP
|
2018-09-03 14:38:04 +02:00 |
|
|
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
2018-08-31 10:28:21 +02:00 |
|
|
|
48db5713d6
|
Version 1.64
|
2018-08-31 10:00:03 +02:00 |
|
|
|
6c34bffbb5
|
Version 1.64 WIP
|
2018-08-30 19:00:22 +02:00 |
|
|
|
f2aa124eb8
|
Version 1.64 WIP
|
2018-08-30 14:25:23 +02:00 |
|
|
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2018-08-29 17:40:52 +02:00 |
|
|
|
9e0f24dcb6
|
Version 1.63
|
2018-08-29 16:20:25 +02:00 |
|
|
|
ec148988f0
|
Reordered some declarations in imgui.h (in prevision of 1.64 refactor)
|
2018-08-29 16:12:23 +02:00 |
|
|
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
|
|
a082692b0a
|
ImFontAtlas Comments (#2042) + added ImGuiFontAtlas_None for consistency.
|
2018-08-25 20:06:17 +02:00 |
|
|
|
042f88e5f0
|
Removed obsolete redirection functions: CollapsingHeader() variation with 2 bools - marked obsolete in v1.49, May 2016.
|
2018-08-23 13:40:38 +02:00 |
|
|
|
3612885dea
|
Comments, demo
|
2018-08-23 13:37:06 +02:00 |
|
|
|
0810d57819
|
Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). (#820, #956, #1875, #2034)
|
2018-08-23 13:26:14 +02:00 |
|
|
|
e28b1078f5
|
Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. (#2034)
|
2018-08-23 13:21:01 +02:00 |
|
|
|
102d5e6de6
|
Rearrange header comments to find enums easily + fixed inconsistent sorting.
|
2018-08-22 22:13:05 +02:00 |
|
|
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2018-08-22 21:35:44 +02:00 |
|
|
|
ea9f5d7600
|
Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). (#2035, #2006, #1443, #1008)
|
2018-08-22 13:25:08 +02:00 |
|
|
|
8d639ec60d
|
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008).
|
2018-08-22 13:09:44 +02:00 |
|
|
|
2dc5ec95d7
|
Internals: InputText: Renaming. Comments.
|
2018-08-22 12:46:46 +02:00 |
|
|
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
2018-08-22 12:46:45 +02:00 |
|
|
|
24ff259816
|
InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008).
|
2018-08-21 21:36:07 +02:00 |
|
|
|
4de6e1f7e4
|
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
|
2018-08-21 15:14:10 +02:00 |
|
|
|
e6c78f9470
|
InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) (#211)
|
2018-08-21 14:27:57 +02:00 |
|
|
|
5942c08143
|
Added IMGUI_VERSION_NUM for easy compile-time testing. (#2025)
|
2018-08-21 14:27:57 +02:00 |
|
|
|
9d7480774f
|
Merge branch 'master' into viewport
|
2018-08-17 11:37:03 -07:00 |
|
|
|
8972ebae73
|
Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. (#1565, #1599, #586)
|
2018-08-15 16:28:39 -07:00 |
|
|
|
4e33aeed82
|
Selectable: Added ImGuiSelectableFlags_Disabled flag in the public API. (#211)
|
2018-08-14 16:07:01 -07:00 |
|
|
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-08-13 17:50:48 -07:00 |
|
|
|
bc6ac8b2ae
|
Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame.
Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.
|
2018-08-03 18:12:36 +02:00 |
|
