770 Commits

Author	SHA1	Message	Date
omar	65e579e558	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp	2018-12-03 11:41:53 +01:00
omar	801645d350	Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).	2018-12-03 10:17:17 +01:00
omar	afeefadb4e	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.h	2018-11-30 18:24:43 +01:00
omar	f663277591	Merge misc/shallow changes from Docking branch to minimize drift: moved some blocks, added comments.	2018-11-30 14:35:13 +01:00
omar	baf67d393f	When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. (#2213)	2018-11-29 23:25:29 +01:00
omar	2fbbcaa339	Viewport: Avoid calling platform functions when window is not created (apart from Platform_GetWindowDpiScale, documented as such). Main viewport situation is still ambiguous. (#1542)	2018-11-29 21:28:47 +01:00
omar	36cbe1e521	Viewport: Misc renaming.	2018-11-29 21:21:04 +01:00
omar	c08b4b46f4	Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196)	2018-11-27 19:46:36 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	d8ab2c1ac9	Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo	2018-11-23 16:55:33 +01:00
omar	862781b195	Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)	2018-11-23 16:35:17 +01:00
omar	cae4d020dc	Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542)	2018-11-22 21:18:14 +01:00
omar	0c4dee083c	Internals: Added ImPool helper data structure (used by testing system, and already in docking branch)	2018-11-22 18:59:57 +01:00
omar	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	d87b80c6c1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-11-22 15:28:27 +01:00
omar	da3c4330c1	Version 1.66	2018-11-22 15:11:52 +01:00
omar	6b4443755d	Internals: Added FindWindowByID() helper. (#2190)	2018-11-15 16:41:48 +01:00
omar	dcbf976a8e	Merge branch 'master' into viewport + comments ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-11-15 13:58:46 +01:00
omar	aa668c410a	Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. (#2168) + adding a else block to make NavCalcPreferredRefPos() more explicit.	2018-11-15 13:56:27 +01:00
omar	6c1ae6cc71	Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).	2018-11-09 14:41:40 +01:00
omar	50f6e12d31	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-10-25 23:41:13 +02:00
omar	ac9aaf4b6e	Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.	2018-10-25 17:45:48 +02:00
omar	69db792bf0	Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. (#1542, #1660, #1878, etc.)	2018-10-15 17:38:36 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	ed4dcd9072	Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()	2018-10-11 22:38:26 +02:00
omar	cf0afb48ac	TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments. ... Internals: Added ImStreolRange() + used in LogRenderedText() + comments.	2018-10-11 12:53:10 +02:00
omar	1efafa1d29	Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)	2018-10-10 12:09:06 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	eb7033e75b	Version 1.66 WIP	2018-09-06 21:44:59 +02:00
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	5a679a45cc	Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718, #2036) ... If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths. The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.	2018-09-06 15:58:25 +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	b944aa623c	Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'	2018-09-05 11:52:48 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
omar	897e5c6231	Viewport: Moved code following refactor. (#2036, #1542)	2018-09-05 11:08:44 +02:00
omar	d07f494305	Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. (#2036) ... Renamed RoundScalarWithFormat -> RoundScalarWithFormatT. Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT	2018-09-03 14:49:13 +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	81bc4265e5	Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)	2018-08-30 19:32:52 +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	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	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	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