1370 Commits

Author	SHA1	Message	Date
omar	b974fffea0	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-09-06 15:59:35 +02:00
omar	e0cab5664a	Version 1.65	2018-09-06 15:58:58 +02:00
omar	8601c39571	Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)	2018-09-05 17:50:55 +02:00
omar	af27ec296b	Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags ... # Conflicts: # imgui.cpp # imgui.h	2018-09-05 17:38:47 +02:00
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)	2018-09-05 17:33:00 +02:00
omar	77ba883f23	Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.	2018-09-05 17:29:47 +02:00
omar	bbcc976739	Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.	2018-09-05 17:29:47 +02:00
omar	b944aa623c	Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'	2018-09-05 11:52:48 +02:00
omar	a848807847	Minor inconsequential merges from Master/Docking branches	2018-09-05 11:51:45 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
omar	bcb1441ce7	Version 1.65 WIP	2018-09-03 14:38:04 +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	6c34bffbb5	Version 1.64 WIP	2018-08-30 19:00:22 +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	ec148988f0	Reordered some declarations in imgui.h (in prevision of 1.64 refactor)	2018-08-29 16:12:23 +02:00
omar	f81caac459	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-08-25 21:19:42 +02:00
omar	a082692b0a	ImFontAtlas Comments (#2042) + added ImGuiFontAtlas_None for consistency.	2018-08-25 20:06:17 +02:00
omar	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
omar	3612885dea	Comments, demo	2018-08-23 13:37:06 +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	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	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	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	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	9d7480774f	Merge branch 'master' into viewport	2018-08-17 11:37:03 -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	4e33aeed82	Selectable: Added ImGuiSelectableFlags_Disabled flag in the public API. (#211)	2018-08-14 16:07:01 -07:00
omar	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
omar	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
omar	8ef0ca9765	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-08-01 12:27:56 +02:00
omar	cc64bd9e3c	Comments	2018-08-01 11:54:54 +02:00
omar	87e2fea09d	Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650) ... Demo: Exposed flags in Demo.	2018-08-01 11:50:57 +02:00
omar	faf2c34149	Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. (#1725, #143).	2018-07-31 13:46:19 +02:00
omar	9824bf1ba1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-07-31 12:12:56 +02:00
omar	d5400d9517	Fixes for pre-C++11 compilers. ... That said, I think we can consider upgrading requirement to an early VS-friendly subset of C++11. The thing I would like the most from C++11 are forward-declared enum (from VS 2012 onward).	2018-07-30 17:42:27 +02:00
omar	049c515840	Added non-const ImVec2 [] operator for consistency (and because some docking code needs it.)	2018-07-24 16:54:19 +02:00
omar	352695bc57	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-07-24 16:50:49 +02:00
omar	4ebd442a24	Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)	2018-07-22 18:53:27 +02:00
omar	e07f5d4c78	Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.	2018-07-22 18:46:41 +02:00
Elias Daler	af38a5c41a	Ignore GCC warning (-Wclass-memaccess) in imgui.h (#1959)	2018-07-22 18:05:13 +02:00