6271 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
omar	480d57e6a2	Revert "Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. (#38, #103, #1172, #1231, #2489)" ... This reverts commit 597c024904.	2019-06-06 01:00:30 +02:00
omar	597c024904	Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. (#38, #103, #1172, #1231, #2489)	2019-06-06 00:42:27 +02:00
omar	e6850891cc	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-06-05 16:09:06 +02:00
omar	c96f2c4057	Window: Fixed one case where auto-resize by double-clicking the resize grip would make either scrollbar appear for a single frame after the resize. Moved Scrollbar visibility block.	2019-06-05 15:59:14 +02:00
omar	300d8dd656	Internals: Moved scrollbar visibility calculation block below the call to UpdateManualResize(). This commit is _intended_ to have no side-effect (next commit will). Also moved ItemWidthDefault calculation below rectangles.	2019-06-05 15:59:14 +02:00
omar	c1a61d25a7	Scrollbar overlap an extra WindowBorderSize amount on the left to make all distances consistent. Reverted to BorderSize not affecting work/contents rectangles. Scrollbar, Style: Changed default style.ScrollbarSize from 16 to 14.	2019-06-05 15:59:14 +02:00
omar	15282261dd	Internals: Minor no-op tidying up toward solving the WindowPadding / WindowBorderSize / ScrollbarSize overlapping mess. ... + Demo: Use SetScrollY().	2019-06-05 15:59:14 +02:00
omar	4149d22e85	Fixed newly created window (e.g. appearing child window) from having scrollbar active on the first frame. (fix 6e03b27) + reworded code a little. (+1 squashed commits) ... Fixed auto-resize with AlwaysVerticalScrollbar or AlwaysHorizontalScrollbar flags not taking account of the expect scrollbar sizes.	2019-06-05 15:59:14 +02:00
omar	06f1d2c101	Internals: Storing ScrollMax into a member. Mostly to facilitate debugging. Also locking down window->Scroll slightly lower in the Begin function.	2019-06-05 15:59:13 +02:00
omar	d6df777ff2	TextWrapped, PushTextWrapPos(0.0f) within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size).	2019-06-05 15:59:13 +02:00
omar	fe32fde376	Internals: Renamed SizeContents to ContentSize, SizeContentsExplicit to ContentSizeExplicit. Tweaked Metrics->Show Rectangles functionality.	2019-06-05 15:59:13 +02:00
omar	f95c77eeea	Window rectangles: Changed WorkRect to cover the whole region including scrolling (toward obsolete ContentsRegionRect) + using full WindowPadding*1 padding. ... Tweaked InnerClipRect. TreeNode, CollapsingHeader: Fixed highlight frame not covering horizontal area fully when using horizontal scrolling. (#2211, #2579) TabBar: Fixed BeginTabBar() within a window with horizontal scrolling from creating a feedback loop with the horizontal contents size. Columns: Fixed Columns() within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size). (#125) Demo: Added demo code to test contentsrect/workrect	2019-06-05 15:59:13 +02:00
omar	a0994d74c2	Clarified behavior of SetNextWindowContentSize(). Content size is defined as the size available after removal of WindowPadding on each sides. So SetNextWindowContentSize(ImVec2(100,100)) + auto-resize will always allow submitting a 100x100 item without creating a scrollbar, regarding of WindowPadding.The exact meaning of ContentSize for decorated windows was previously ill-defined.	2019-06-05 15:59:13 +02:00
omar	09bcf9fbc5	Window rectangles: Made InnerRect not affected by window border sizes. its few users shouldn't be meaningfully affected.	2019-06-05 15:59:12 +02:00
omar	b9874a2423	Comments about obsoleted features version. Todo. Clarify tab bar initial offset (useful if we decide to remove the half-windowpadding clip margin).	2019-06-05 15:58:49 +02:00
omar	440ad0b440	Merge branch 'master' into docking	2019-06-05 00:37:20 +02:00
omar	5cdd788f30	Comments (#2599). Moved branch Changelog above 1.71 wip one. Added some missing changelog bits.	2019-06-05 00:37:14 +02:00
omar	57d8ab62f4	Nav: Fixed rare crash when e.g. releasing Alt-key while focusing a window with a menu at the same frame as clearing the focus. This was in most noticeable in some back-ends with emits key release events when focusing another viewport. (#2609)	2019-06-05 00:28:55 +02:00
DucaRii	6614bab883	Combo: Fixed rounding not applying with the ImGuiComboFlags_NoArrowButton flag. (#2606, #2607)	2019-06-04 20:49:29 +02:00
omar	eb7849b477	Nav: Fixed gamepad/keyboard moving of window affecting contents size incorrectly, sometimes leading to scrollbars appearing during the movement. + minor fix with the mostly dead Ctrl+wheel scaling.	2019-05-31 20:48:52 +02:00
omar	596d81a973	Merge branch 'master' into docking	2019-05-31 12:09:40 +02:00
omar	cef88f6aae	ImDrawListSplitter: Support merging consecutive draw commands straddling two channels. Support zero-init.	2019-05-31 12:06:35 +02:00
omar	f1f4b42d91	ImDrawListSplitter: extracted out of ImDrawList. Down the line we may obsolete the ImDrawList functions and encourage users to store the splitter aside, in the meanwhile ImDrawList holds a splitter. ... (This will allow columns/table to recurse.)	2019-05-31 12:03:10 +02:00
omar	8abf1313aa	ImDrawList: Fix broken channel splitting (another issue when the first channel is empty) (#2591) + fixed warnings with newer VS	2019-05-31 11:47:00 +02:00
Sebastian Krzyszkowiak	bff7202ff2	Include <alloca.h> also when __SWITCH__ is defined (#2595) ... Fixes compilation with devkitPro for Nintendo Switch	2019-05-31 01:52:22 +02:00
omar	84f3ecc231	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-05-30 18:52:24 +02:00
omar	42c98c5eea	ImDrawList: Fix broken channel splitting (broken by d1e8b69) (#2591)	2019-05-30 18:47:46 +02:00
omar	546b728199	Internals: Window rectangles: Fixed ContentsRegion lag by moving back after Scrollbar, fixes b50c61c9. Shuffling setup order and added comments.	2019-05-30 18:19:14 +02:00
omar	21ebdcafc9	Internals: Window rectangles: Renaming of all rectangles toward their final form. Should be a no-op. Renamed GetWorkRectMax() to GetContentRegionMaxAbs(). Metrics shows SizeContents.	2019-05-30 18:04:21 +02:00
omar	cc48f1e5dd	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm	2019-05-30 16:47:11 +02:00
omar	c3d600abed	Fixed imgui_impl_opengl3 broken in previous few commits. (#2591, #2593, #2594)	2019-05-30 16:45:59 +02:00
Max Thrun	ed79b4d22e	Examples/Backends: Metal: Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591, #2592)	2019-05-29 19:45:15 +02:00
omar	8dc04a4c9f	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp # imgui.h # imgui_demo.cpp	2019-05-29 16:32:27 +02:00
omar	7755cbbef2	Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. (#2591) + Fix OpenGL3 code missing flag.	2019-05-29 16:29:17 +02:00
omar	c72040a715	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_osx.h # examples/imgui_impl_osx.mm # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2019-05-29 16:20:26 +02:00
omar	b3dd03f582	Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591)	2019-05-29 16:13:38 +02:00
omar	d1e8b698d0	ImDrawList: Added ImDrawCmd::VtxOffset value to support large meshes (64k+ vertices) using 16-bits indices. To enable the feature, the renderer back-end needs to set 'io.BackendFlags |= ImGuiBackendFlags_HasVtxOffset' and honor the ImDrawCmd::VtxOffset field. Otherwise the value will always be zero. This has the advantage of preserving smaller index buffers and allowing to execute on hardware that do not support 32-bits indices. ... ImDrawList: Added ImDrawCmd::IdxOffset value, equivalent to summing element count for each draw command. This is provided for convenience and consistency with VtxOffset. (#2591)	2019-05-29 16:13:38 +02:00
omar	40b9e5e0b4	ImDrawList: Store initial flags for the frame in ImDrawListSharedData, reducing code duplication in setting up the flags.	2019-05-29 14:26:03 +02:00
omar	cb7ba60d3f	CollapsingHeader: When a close button is enabled, better clip the label to avoid overlap. (#600)	2019-05-28 21:25:28 +02:00
omar	c487bc52a2	Fonts: Added some details about using custom colorful icons.	2019-05-28 20:17:15 +02:00
omar	70d9f79312	Internal: Renamed InnerMainRect to InnerVisibleRect. Printing coordinates in Metrics window.	2019-05-28 11:23:04 +02:00
omar	2742663ad2	Changelog, minor tweaks. (#2585)	2019-05-28 11:23:04 +02:00
actboy168	c0e690318a	Examples: imgui_impl_osx: Added mouse cursor support. (#2585, #1873)	2019-05-28 11:15:59 +02:00
omar	c7c1bf177b	Docking: Fixed DockBuilderRemoveNode() from overwriting other parent node flags when trying to move the CentralNode flag.	2019-05-28 00:06:21 +02:00
omar	5b0e59d9d5	Docking: Saving local _NoResize flag. (#2583)	2019-05-27 22:11:21 +02:00
omar	2d68e892a8	Added full "Dear ImGui" prefix to the title of "Dear ImGui Demo" and "Dear ImGui Metrics" windows. Shortened amount of nodes in columns>tree demo.	2019-05-27 18:38:28 +02:00
omar	7c06d9f043	Docking: Saving the NoTabBar, NoWindowMenuButton, NoCloseButton fields of dock node into the .ini file. Added them to the Metrics window. (#2583, #2423, #2109).	2019-05-27 17:06:17 +02:00
omar	9c35344175	Comments, todo entries, moved ImGuiSelectableFlagsPrivate in higher ranges to match others.	2019-05-27 16:50:56 +02:00
omar	70a4be07df	ColorEdit: Fixed the color picker popup only displaying inputs as HSV instead of showing multiple options. (#2587, broken in 1.69 by #2384).	2019-05-27 14:57:39 +02:00
omar	511e32e8ca	Docking: Clarified terminology of docking/tablist/collapse button into Window Menu button matching master. Added private ImGuiDockNodeFlags_NoWindowMenuButton, ImGuiDockNodeFlags_NoCloseButton flags. (#2583, #2109)	2019-05-27 12:35:20 +02:00