omar
|
af27ec296b
|
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
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)
|
6 years ago |
|
omar
|
77ba883f23
|
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.
|
6 years ago |
|
omar
|
bbcc976739
|
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
|
6 years ago |
|
omar
|
b944aa623c
|
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
|
6 years ago |
|
omar
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
6 years ago |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
897e5c6231
|
Viewport: Moved code following refactor. (#2036, #1542)
|
6 years ago |
|
omar
|
40db2ca098
|
Fixed a build issue with non-Cygwin GCC under Windows.
|
6 years ago |
|
omar
|
1007873d94
|
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
|
6 years ago |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
6 years ago |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
6 years ago |
|
omar
|
fd90afef43
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542)
|
6 years ago |
|
omar
|
5207afa0dd
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542)
|
6 years ago |
|
omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
48db5713d6
|
Version 1.64
|
6 years ago |
|
omar
|
38cfcf9fbc
|
Tweak comments and indexes
|
6 years ago |
|
omar
|
c83391262e
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
6 years ago |
|
omar
|
00262d51ad
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
6 years ago |
|
omar
|
d7c04ccbfb
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
6 years ago |
|
omar
|
b1f263b34b
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
6 years ago |
|
omar
|
a58e4dfd0f
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
8a216fe756
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
6 years ago |
|
omar
|
fd2bfb7e07
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
6 years ago |
|
omar
|
064b949bc2
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
6 years ago |
|
omar
|
2a0d26e603
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
6 years ago |
|
omar
|
df37a156e8
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
346f83e014
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
6 years ago |
|
omar
|
fefcc77f13
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
6 years ago |
|
omar
|
b6cdfef442
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
6 years ago |
|
omar
|
172e426ba9
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
6 years ago |
|
omar
|
f74d9ec7f7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)
|
6 years ago |
|
omar
|
9093166eea
|
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)
|
6 years ago |
|
omar
|
f5ed5478e1
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
6 years ago |
|
omar
|
9a4234ea8e
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
6 years ago |
|
omar
|
af002dc861
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
6 years ago |
|
omar
|
adeb993122
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
81bc4265e5
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
a44c5f7afe
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
6 years ago |
|
omar
|
728b2ef026
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
6 years ago |
|
omar
|
cda45737ab
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
6 years ago |
|
omar
|
acf3cc4c3f
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
6 years ago |
|
omar
|
8a6fd237f6
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
6 years ago |
|
omar
|
84eb2682b7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)
|
6 years ago |
|
omar
|
73052dc00c
|
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)
|
6 years ago |
|
omar
|
6bda59e5b7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
6 years ago |
|
omar
|
60ee4de56d
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
6 years ago |
|
omar
|
ce58795bdf
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
6 years ago |
|
omar
|
f2926f910f
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
15172f0742
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
6 years ago |
|
omar
|
98f618ed18
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
6 years ago |
|
omar
|
521405488b
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
24dfa0c957
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
158a65c98f
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
6caf074bd5
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
905e14f384
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
4be79a8955
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
2d952504ed
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
43219d36a6
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
99b27488e7
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
6c34bffbb5
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
2714f8fa23
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
c25f48b902
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
ad0bfdcd95
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
5dc954f5d7
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
a265c62636
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
0e9577d0da
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
f26b8c1e07
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
6468a3c0ce
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
3eaa063984
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
6 years ago |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
6 years ago |
|
omar
|
92edb7a4e3
|
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
|
6 years ago |
|
omar
|
2598d26c73
|
ColorEdit4: Fixed a bug when text input or drag and drop leading to unsaturated HSL values would erroneously alter the resulting color. (#2050)
|
6 years ago |
|
omar
|
f9634feb66
|
Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR (#846)
|
6 years ago |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
e9c849884a
|
Viewport: Fixed warnings due to bad merge.
|
6 years ago |
|
omar
|
06e917f135
|
Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. (#2034, #820, #956, #1875)
|
6 years ago |
|
omar
|
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)
|
6 years ago |
|
omar
|
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)
|
6 years ago |
|
omar
|
abaa274592
|
Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. (#2034)
|
6 years ago |
|
omar
|
102d5e6de6
|
Rearrange header comments to find enums easily + fixed inconsistent sorting.
|
6 years ago |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
|
omar
|
7011d87bf8
|
InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. (#2006, #1443, #1008)
|
6 years ago |
|
omar
|
7d9d9bc34e
|
InputText: Fix ResizeCallback callback on restoring initial value with Escape key. Avoid over-allocating for InitialText storage. (#2006, #1443, #1008)
|
6 years ago |
|
omar
|
ea9f5d7600
|
Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). (#2035, #2006, #1443, #1008)
|
6 years ago |
|
omar
|
8d639ec60d
|
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008).
|
6 years ago |
|
omar
|
ea1906004b
|
InputText: Fixed a few pathological crash cases on single-line InputText widget with multiple millions characters worth of contents. Because the current text drawing function reserve for a worst-case amount of vertices and how we handle horizontal clipping, we currently just avoid displaying those single-line widgets when they are over a threshold of 2 millions characters, until a better solution is found.
|
6 years ago |
|
omar
|
5122c76441
|
InputText: Fixed not tracking the cursor horizontally When modifying the text buffer through a callback.
|
6 years ago |
|
omar
|
68448c5faa
|
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
|
6 years ago |
|
omar
|
2dc5ec95d7
|
Internals: InputText: Renaming. Comments.
|
6 years ago |
|
omar
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
6 years ago |
|
omar
|
24ff259816
|
InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008).
|
6 years ago |
|
omar
|
4de6e1f7e4
|
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
|
6 years ago |
|
omar
|
0fd6e9bc0d
|
InputText: Fixed minor off-by-one issue when submitting a buffer size smaller than the initial zero-terminated buffer contents.
|
6 years ago |
|
omar
|
e6c78f9470
|
InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) (#211)
|
6 years ago |
|
omar
|
5942c08143
|
Added IMGUI_VERSION_NUM for easy compile-time testing. (#2025)
|
6 years ago |
|
omar
|
f23d29b481
|
Added links to Discourse forums.
|
6 years ago |