omar
|
40db2ca098
|
Fixed a build issue with non-Cygwin GCC under Windows.
|
2018-09-04 18:58:20 +02:00 |
|
omar
|
1007873d94
|
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
|
2018-09-03 19:51:22 +02:00 |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
2018-09-03 14:38:04 +02:00 |
|
omar
|
fd201a90f1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-08-31 18:39:02 +02:00 |
|
omar
|
5d40d295b3
|
Comments, readme updates
|
2018-08-31 11:37:14 +02:00 |
|
omar
|
fd90afef43
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542)
|
2018-08-31 11:11:18 +02:00 |
|
omar
|
5207afa0dd
|
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542)
|
2018-08-31 11:06:21 +02:00 |
|
omar
|
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 |
|
omar
|
48db5713d6
|
Version 1.64
|
2018-08-31 10:00:03 +02:00 |
|
omar
|
38cfcf9fbc
|
Tweak comments and indexes
|
2018-08-31 09:59:58 +02:00 |
|
omar
|
c83391262e
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
2018-08-30 21:21:14 +02:00 |
|
omar
|
00262d51ad
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
2018-08-30 21:19:30 +02:00 |
|
omar
|
d7c04ccbfb
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
2018-08-30 21:18:16 +02:00 |
|
omar
|
b1f263b34b
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
2018-08-30 21:16:30 +02:00 |
|
omar
|
a58e4dfd0f
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
2018-08-30 21:16:23 +02:00 |
|
omar
|
8a216fe756
|
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)
|
2018-08-30 21:15:12 +02:00 |
|
omar
|
fd2bfb7e07
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)
|
2018-08-30 21:00:51 +02:00 |
|
omar
|
064b949bc2
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)
|
2018-08-30 20:59:24 +02:00 |
|
omar
|
2a0d26e603
|
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)
|
2018-08-30 20:58:36 +02:00 |
|
omar
|
df37a156e8
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
2018-08-30 20:51:57 +02:00 |
|
omar
|
346f83e014
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
2018-08-30 19:41:02 +02:00 |
|
omar
|
fefcc77f13
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
2018-08-30 19:40:40 +02:00 |
|
omar
|
b6cdfef442
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
2018-08-30 19:38:44 +02:00 |
|
omar
|
172e426ba9
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
2018-08-30 19:36:59 +02:00 |
|
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)
|
2018-08-30 19:36:40 +02:00 |
|
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)
|
2018-08-30 19:35:19 +02:00 |
|
omar
|
f5ed5478e1
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
2018-08-30 19:35:12 +02:00 |
|
omar
|
9a4234ea8e
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
2018-08-30 19:35:06 +02:00 |
|
omar
|
af002dc861
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
2018-08-30 19:34:48 +02:00 |
|
omar
|
adeb993122
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:33:02 +02:00 |
|
omar
|
81bc4265e5
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:32:52 +02:00 |
|
omar
|
a44c5f7afe
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
2018-08-30 19:30:17 +02:00 |
|
omar
|
728b2ef026
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
cda45737ab
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
acf3cc4c3f
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
8a6fd237f6
|
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
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)
|
2018-08-30 19:23:11 +02:00 |
|
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)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
6bda59e5b7
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)
|
2018-08-30 19:23:11 +02:00 |
|
omar
|
60ee4de56d
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)
|
2018-08-30 19:23:10 +02:00 |
|
omar
|
ce58795bdf
|
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)
|
2018-08-30 19:23:10 +02:00 |
|
omar
|
f2926f910f
|
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:23:10 +02:00 |
|
omar
|
15172f0742
|
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)
|
2018-08-30 19:23:10 +02:00 |
|
omar
|
98f618ed18
|
Refactor: Internals: Moved various functions in imgui.cpp (#2036)
|
2018-08-30 19:23:10 +02:00 |
|
omar
|
521405488b
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:21:50 +02:00 |
|
omar
|
24dfa0c957
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:12:33 +02:00 |
|
omar
|
158a65c98f
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:49 +02:00 |
|
omar
|
6caf074bd5
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:42 +02:00 |
|
omar
|
905e14f384
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:36 +02:00 |
|
omar
|
4be79a8955
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:04:04 +02:00 |
|
omar
|
2d952504ed
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:01:05 +02:00 |
|
omar
|
43219d36a6
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:00:59 +02:00 |
|
omar
|
99b27488e7
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 19:00:52 +02:00 |
|
omar
|
6c34bffbb5
|
Version 1.64 WIP
|
2018-08-30 19:00:22 +02:00 |
|
omar
|
2714f8fa23
|
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:46 +02:00 |
|
omar
|
c25f48b902
|
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:46 +02:00 |
|
omar
|
ad0bfdcd95
|
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
5dc954f5d7
|
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
a265c62636
|
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:45 +02:00 |
|
omar
|
0e9577d0da
|
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 15:40:44 +02:00 |
|
omar
|
f26b8c1e07
|
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:55:27 +02:00 |
|
omar
|
6468a3c0ce
|
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:50:32 +02:00 |
|
omar
|
3eaa063984
|
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036)
|
2018-08-30 14:50:32 +02:00 |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
2018-08-30 14:25:23 +02:00 |
|
omar
|
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 |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
2018-08-29 16:20:25 +02:00 |
|
omar
|
92edb7a4e3
|
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
|
2018-08-29 16:12:54 +02:00 |
|
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)
|
2018-08-29 13:30:46 +02:00 |
|
omar
|
f9634feb66
|
Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR (#846)
|
2018-08-28 19:10:59 +02:00 |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
omar
|
e9c849884a
|
Viewport: Fixed warnings due to bad merge.
|
2018-08-24 15:42:31 +02:00 |
|
omar
|
06e917f135
|
Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. (#2034, #820, #956, #1875)
|
2018-08-23 13:47:37 +02:00 |
|
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)
|
2018-08-23 13:26:14 +02:00 |
|
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)
|
2018-08-23 13:21:01 +02:00 |
|
omar
|
abaa274592
|
Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. (#2034)
|
2018-08-22 22:31:51 +02:00 |
|
omar
|
102d5e6de6
|
Rearrange header comments to find enums easily + fixed inconsistent sorting.
|
2018-08-22 22:13:05 +02:00 |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2018-08-22 21:35:44 +02:00 |
|
omar
|
7011d87bf8
|
InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. (#2006, #1443, #1008)
|
2018-08-22 21:27:27 +02:00 |
|
omar
|
7d9d9bc34e
|
InputText: Fix ResizeCallback callback on restoring initial value with Escape key. Avoid over-allocating for InitialText storage. (#2006, #1443, #1008)
|
2018-08-22 21:11:55 +02:00 |
|
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)
|
2018-08-22 13:25:08 +02:00 |
|
omar
|
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 |
|
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.
|
2018-08-22 12:46:47 +02:00 |
|
omar
|
5122c76441
|
InputText: Fixed not tracking the cursor horizontally When modifying the text buffer through a callback.
|
2018-08-22 12:46:47 +02:00 |
|
omar
|
68448c5faa
|
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
|
2018-08-22 12:46:47 +02:00 |
|
omar
|
2dc5ec95d7
|
Internals: InputText: Renaming. Comments.
|
2018-08-22 12:46:46 +02:00 |
|
omar
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
2018-08-22 12:46:45 +02:00 |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
0fd6e9bc0d
|
InputText: Fixed minor off-by-one issue when submitting a buffer size smaller than the initial zero-terminated buffer contents.
|
2018-08-21 14:27:57 +02:00 |
|
omar
|
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 |
|
omar
|
5942c08143
|
Added IMGUI_VERSION_NUM for easy compile-time testing. (#2025)
|
2018-08-21 14:27:57 +02:00 |
|
omar
|
f23d29b481
|
Added links to Discourse forums.
|
2018-08-20 10:45:10 +02:00 |
|
omar
|
4910629f6a
|
Internals: Moved code out of SliderBehaviorT to reduce code bloat and also because caller may have use for the grab_bb for styling purposes.
|
2018-08-20 09:59:51 +02:00 |
|
omar
|
9d7480774f
|
Merge branch 'master' into viewport
|
2018-08-17 11:37:03 -07:00 |
|
omar
|
bb2de30e3e
|
Internals: Added ImTextCountUtf8BytesFromChar() helper.
|
2018-08-17 11:33:45 -07:00 |
|
omar
|
ac39c4b2a8
|
SplitterBehavior: Fix for when the sizes are already under the minimum desired size.
|
2018-08-17 11:33:40 -07:00 |
|
omar
|
341ebd961b
|
Fixed assertion when transitioning from an active ID to another within a group, affecting ColorPicker (broken in 1.62). Made ActiveIdIsAlive track the actual ID to avoid incorrect polling in BeginGroup/EndGroup when the ID changes within the group. (#2023, #820, #956, #1875).
|
2018-08-16 13:33:16 -07:00 |
|
omar
|
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 |
|
omar
|
5d630c930d
|
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542)
|
2018-08-15 16:15:44 -07:00 |
|
omar
|
9852649e97
|
Viewport: Initial viewport DpiScale only queried on viewport creation. Because AddUpdateViewport() is called repeatedly on MovingWindow or with ImGuiConfigFlags_ViewportsNoMerge, the DpiScale update would break ImGuiConfigFlags_DpiEnableScaleViewports. (#1542)
|
2018-08-14 19:17:33 -07:00 |
|