imgui

mirror of https://github.com/Drezil/imgui.git synced 2024-12-30 11:36:35 +00:00

Author	SHA1	Message	Date
omar	69b5c2f541	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-11-08 15:45:12 +01:00
omar	57dc34f4e8	TreeNode: Added IsItemToggledOpen() to explicitly query if item was just open/closed, facilitating interactions with custom multi-selections patterns. (#1896 , #1861 )	2019-11-08 15:30:15 +01:00
omar	09b2310237	Internals: Added index of helpers and shuffled a few things.	2019-11-06 20:37:47 +01:00
omar	b3e94f5de8	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-10-29 17:21:19 +01:00
stfx	6bf5aed325	Declaration and assignment can be joined, Member function may be 'const'. (#2875 )	2019-10-29 17:11:49 +01:00
omar	0cbb96895a	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx12.cpp # imgui.cpp # imgui.h # imgui_widgets.cpp	2019-10-24 15:11:37 +02:00
omar	23c1ff4907	Removed redirecting functions/enums names that were marked obsolete in 1.52 (October 2017). - Begin() [old 5 args version] -> use Begin() [3 args], use SetNextWindowSize() SetNextWindowBgAlpha() if needed - IsRootWindowOrAnyChildHovered() -> use IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows) - AlignFirstTextHeightToWidgets() -> use AlignTextToFramePadding(); - SetNextWindowPosCenter() -> use SetNextWindowPos() with a pivot of (0.5f, 0.5f) - ImFont::Glyph -> use ImFontGlyph If you were still using the old names, read "API Breaking Changes" section of imgui.cpp to find out the new names or equivalent features, or see how they were implemented until 1.73.	2019-10-22 14:45:11 +02:00
omar	048b73dfaa	Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.	2019-10-21 20:57:07 +02:00
omar	7feccf9ab2	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_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # imgui.cpp	2019-10-18 16:50:30 +02:00
omar	bf746c4215	DragScalar, SliderScalar, InputScalar: Added p_ prefix to parameter that are pointers to the datato clarify how they are used, and more comments redirecting to the demo code. (#2844 )	2019-10-11 12:04:28 +02:00
omar	bf4880f6a2	Merge branch 'master' into docking	2019-10-07 19:14:37 +02:00
omar	8aad3482a4	ImVector: Fixed index_from_ptr() not asserting when passed end() element.	2019-10-07 17:22:55 +02:00
omar	e0c0e53edf	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-10-04 19:22:42 +02:00
omar	892dfb1dea	InputText, Nav: Fixed Home/End key broken when activating Keyboard Navigation. (#787 ) Small refactor of ActiveIdUsingXXX inputs flags toward a little more consistent system. (#2637)	2019-10-02 15:57:36 +02:00
omar	c262276988	Version 1.74 WIP	2019-09-30 14:27:56 +02:00
omar	6994bf10bc	Merge branch 'master' into docking + fix for RenderMouseCursor() # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h	2019-09-24 17:14:51 +02:00
omar	d5efe16157	Version 1.73	2019-09-24 17:02:26 +02:00
omar	3233d85d2f	Merge branch 'master' into docking	2019-09-22 22:16:11 +02:00
omar	f47a0a85cc	ImVector: added find, find_erase, find_erase_unsorted helpers.	2019-09-22 19:06:20 +02:00
omar	eab03f4467	Selectable: Added ImGuiSelectableFlags_AllowItemOverlap flag in public api (was previously internal only).	2019-09-22 19:03:51 +02:00
omar	af93c21cf9	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-09-18 17:27:14 +02:00
omar	9d02ed51e3	TreeNode: Added ImGuiTreeNodeFlags_SpanAvailWidth and ImGuiTreeNodeFlags_SpanFullWidth flags (#2451 , #2438 , #1897 ) Added demo bits.	2019-09-18 17:13:41 +02:00
omar	575df6f192	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h	2019-09-17 16:35:50 +02:00
omar	b48dc067ae	Style: Allow style.WindowMenuButtonPosition to be set to ImGuiDir_None to hide the collapse button. (#2634 , #2639 ) + Fix #2775	2019-09-17 16:33:15 +02:00
omar	3b014d0c31	Merge branch 'features/ellipsis_rendering' # Conflicts: # imgui.cpp	2019-09-17 12:07:30 +02:00
omar	7d5a17e5e4	Remove trailing spaces (grep for ' \r?$' in visual studio)	2019-09-17 11:33:18 +02:00
omar	57623c15dd	Font: Narrow ellipsis: various minor stylistic tweaks (#2775 )	2019-09-17 11:13:34 +02:00
Rokas Kupstys	45405f0dc9	Font: implement a way to draw narrow ellipsis without relying on hardcoded 1 pixel dots. (#2775 ) This changeset implements several pieces of the puzzle that add up to a narrow ellipsis rendering. ## EllipsisCodePoint `ImFontConfig` and `ImFont` received `ImWchar EllipsisCodePoint = -1;` field. User may configure `ImFontConfig::EllipsisCodePoint` a unicode codepoint that will be used for rendering narrow ellipsis. Not setting this field will automatically detect a suitable character or fall back to rendering 3 dots with minimal spacing between them. Autodetection prefers codepoint 0x2026 (narrow ellipsis) and falls back to 0x0085 (NEXT LINE) when missing. Wikipedia indicates that codepoint 0x0085 was used as ellipsis in some older windows fonts. So does default Dear ImGui font. When user is merging fonts - first configured and present ellipsis codepoint will be used, ellipsis characters from subsequently merged fonts will be ignored. ## Narrow ellipsis Rendering a narrow ellipsis is surprisingly not straightforward task. There are cases when ellipsis is bigger than the last visible character therefore `RenderTextEllipsis()` has to hide last two characters. In a subset of those cases ellipsis is as big as last visible character + space before it. `RenderTextEllipsis()` tries to work around this case by taking free space between glyph edges into account. Code responsible for this functionality is within `if (text_end_ellipsis != text_end_full) { ... }`. ## Fallback (manually rendered dots) There are cases when font does not have ellipsis character defined. In this case RenderTextEllipsis() falls back to rendering ellipsis as 3 dots, but with reduced spacing between them. 1 pixel space is used in all cases. This results in a somewhat wider ellipsis, but avoids issues where spaces between dots are uneven (visible in larger/monospace fonts) or squish dots way too much (visible in default font where dot is essentially a pixel). This fallback method obsoleted `RenderPixelEllipsis()` and this function was removed. Note that fallback ellipsis will always be somewhat wider than it could be, however it will fit in visually into every font used unlike what `RenderPixelEllipsis()` produced.	2019-09-17 11:13:07 +02:00
omar	0bdc145343	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-31 19:19:00 +02:00
omar	b59ec7b9b7	DragInt, DragFloat, DragScalar: Using (v_min > v_max) allows locking any edit to the value.	2019-08-30 20:30:21 +02:00
omar	bfcdaeb610	Disable with ConfigWindowsMemoryCompactTimer < 0.0f (#2636 )	2019-08-28 20:30:36 +02:00
omar	62f75c7fb1	Added a mechanism to compact/free the larger allocations of unused windows (buffers are compacted when a window is unused for 60 seconds, as per io.ConfigWindowsMemoryCompactTimer = 60.0f). Note that memory usage has never been reported as a problem, so this is merely a touch of overzealous luxury. (#2636 )	2019-08-28 20:28:36 +02:00
omar	c8418015c2	SliderScalar: Improved assert when using U32 or U64 types with a large v_max value. (#2765 ) + misc minor stuff.	2019-08-28 15:19:10 +02:00
omar	e1fca8d982	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-23 12:21:49 +02:00
omar	c4ff1b3578	ImDrawList: clarified the name of many parameters so reading the code is a little easier. (#2740 )	2019-08-22 17:43:57 +02:00
omar	3fb5cf3541	Using offsetof() when available in C++11. Avoids Clang sanitizer complaining about old-style macros. (#94 )	2019-08-22 16:55:42 +02:00
omar	aedcd2fb1a	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx11.cpp # imgui.cpp	2019-08-19 21:49:53 +02:00
omar	f624455d7b	Version 1.73 WIP	2019-08-01 10:57:13 -07:00
omar	b8d8355f10	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-31 14:34:58 -07:00
omar	6a0d0dab5a	Version 1.72b (patch for nav)	2019-07-31 14:31:06 -07:00
omar	9183e7c426	Version 1.73 WIP	2019-07-29 15:54:32 -07:00
omar	a1164399b0	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-07-27 18:21:41 -07:00
omar	ecb9b1e2eb	Version 1.72	2019-07-27 18:15:07 -07:00
omar	d057550209	Fixed Clang 8.0 warning "empty expression statement has no effect; remove unnecessary ';' to silence this" warning [-Wextra-semi-stmt] + Comment	2019-07-24 17:07:05 -07:00
omar	e5b905481d	Viewport: Refactored ViewportFlagsOverrideMask+ViewportFlagsOverrideValue into ViewportFlagsOverrideSet+ViewportFlagsOverrideClear which appears easier to grasp. (#1542 ) (cherry picked from commit 9437630872e7ca19065bee78fcafaab54a0d5bf2)	2019-07-24 13:45:18 -07:00
omar	81b24bd728	Docking: Moving types in imgui.h	2019-07-23 13:37:52 -07:00
omar	db2581bee9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-07-23 13:35:01 -07:00
omar	51853292cc	ImDrawList: Using ImDrawCornerFlags instead of int in various apis. Demo: Using ImGuiColorEditrFlags instead of int.	2019-07-23 10:41:48 -07:00
omar	0e6a096afd	Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. (#2109 ) Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.	2019-07-22 11:29:22 -07:00
omar	6f8d34768d	Docking: Removed seemingly unnecessary test in TabItemEx() for undocking tab leading to window move. Added ImGuiDockNode::IsFloatingNode() helper to clarify code intent in various places.	2019-07-22 11:02:44 -07:00
omar	9cda3035fd	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp	2019-07-22 10:29:14 -07:00
omar	363d33f64e	Increased IMGUI_VERSION_NUM to facilitate transition of OSX clipboard support for framework using/embedding any version of imgui. Amend `29d9394`. (#2546 )	2019-07-22 10:23:27 -07:00
omar	f0348ddffc	Amend `0f86116`, renamed to ImGuiKey_KeyPadEnter Changelog.. (#2677 , #2005 )	2019-07-21 18:39:50 -07:00
Aaron Cooper	0f86116a69	Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.	2019-07-21 18:29:11 -07:00
omar	7fd34d4f30	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-07-17 18:48:16 -07:00
omar	ea79992d9a	Fixed old SetWindowFontScale() api value from not being inherited by child window. Added comments about the right way to scale your UI (load a font at the right side, rebuild atlas, scale style). + Added missing IMGUI_API marker to the EmptyString storage used by ImGuiTextBuffer. (#2672)	2019-07-17 10:01:49 -07:00
omar	56e10f1c35	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-07-16 18:29:31 -07:00
omar	e6a286b3a5	Style: Added style.ColorButtonButton (left/right, defaults to ImGuiDir_Right) to move the color button of ColorEdit3/ColorEdit4 functions to either side of the inputs.	2019-07-16 16:43:21 -07:00
omar	a35f42f123	Removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). (#581 , #324 )	2019-07-15 18:30:20 -07:00
omar	7a9d32acee	Fixed unnecessary test in UpdateMouseWheel() (thanks PVS). TreeNodeBehavior: avoid computing bg_col for non-framed non-active tree nodes. Comments, binaries update, minor typos.	2019-07-15 18:30:20 -07:00
omar	dd80db87a6	Viewport: Added ImGuiViewportFlags_NoAutoMerge to prevent merging into host viewport in a per-window basis via the ImGuiWindowClass override mechanism. (#1542 )	2019-07-15 13:35:21 -07:00
omar	e461e7bc7a	Moved ImGuiColumnsFlags erroneously forward declared in imgui.h + demo bit.	2019-07-14 12:29:23 -07:00
omar	d52c6316c8	Renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).	2019-07-12 11:58:46 +02:00
omar	e66799f79a	Prefixed internal structs exposed in imgui.h with a fully qualified name to facilitate auto-generation with cimgui.	2019-07-12 11:54:22 +02:00
omar	d23f1b1409	fonts/binary_to_compress: display error message when failing to open file + misc comments.	2019-07-10 12:58:11 +02:00
omar	1f54c16f52	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-02 18:47:10 +02:00
kevreco	caf119a982	Added 'SetScrollHereX' and 'SetScrollFromPosX' (#1580 )	2019-07-01 12:15:48 +02:00
omar	41e2d4b5ae	ImDrawListSplitter: Fixed memory leak when using low-level split api (was not affecting ImDrawList api, also this type was added in 1.71 and not advertised as a public-facing feature).	2019-06-20 16:09:45 +02:00
omar	f563e1a504	Internals: Renamed GetFrontMostPopupModal() to GetTopMostPopupModal() to be consistent. Renamed other locals to follow that terminology.	2019-06-19 18:16:38 +02:00
omar	adbbd17cb6	Addendum to #2635 . Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. (#1542 )	2019-06-18 23:37:57 +02:00
Vincent Hamm	3e8eebfbec	Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. (#1542 , #2635 )	2019-06-18 23:16:52 +02:00
omar	e2c1f0a7cd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-06-18 23:12:50 +02:00
omar	e9b92d1cef	Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. (#2618 ) + Fix version number in imgui.h	2019-06-17 11:32:00 +02:00
omar	b27fd87177	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h	2019-06-17 11:10:14 +02:00
omar	af3080b81b	Removed redirecting functions/enums that were obsoleted in version 1.51 (June 2017): ImGuiCol_Column, ImGuiSetCond_, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME.	2019-06-14 12:05:00 +02:00
omar	5286ecb8a7	Version 1.72 WIP	2019-06-14 11:58:58 +02:00
omar	d3d998a885	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/README.txt # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp	2019-06-12 18:40:50 +02:00
omar	2da1c66d15	Version 1.71 + comments	2019-06-12 18:30:06 +02:00
omar	4597632662	Readme, comments, dear imgui prefixes	2019-06-11 16:11:36 +02:00
omar	a9b5c834b6	ImDrawListSplitter: Don't merge draw commands when crossing a VtxOffset boundary + Renamed fields ImDrawChannels to consistently suggest those are internal structures.	2019-06-11 11:49:31 +02:00
omar	d8435c7710	ImDrawListSplitter: Fix idx offset when merging (`cef88f6`) (#2591 )	2019-06-10 15:02:44 +02:00
omar	5f409c6fcc	Merge branch 'master' into docking # Conflicts: # examples/example_apple_opengl2/main.mm # examples/example_emscripten/main.cpp # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_glut_opengl2/main.cpp # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_widgets.cpp	2019-06-06 16:20:12 +02:00
omar	fea5f70611	ImDrawCallback: Allow to override the signature of ImDrawCallback by #define-ing it. This is meant to facilitate custom rendering back-ends passing local render-specific data to the draw callback.	2019-06-06 15:28:37 +02:00
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	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	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	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	596d81a973	Merge branch 'master' into docking	2019-05-31 12:09:40 +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	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	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	c487bc52a2	Fonts: Added some details about using custom colorful icons.	2019-05-28 20:17:15 +02:00
omar	5b0e59d9d5	Docking: Saving local _NoResize flag. (#2583 )	2019-05-27 22:11:21 +02:00
omar	9c35344175	Comments, todo entries, moved ImGuiSelectableFlagsPrivate in higher ranges to match others.	2019-05-27 16:50:56 +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
omar	afad952450	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2019-05-24 21:58:17 +02:00
omar	958d75c00a	Style: Added style.WindowMenuButtonPosition (left/right, defaults to ImGuiDir_Left) to move the collapsing/docking button to the other side of the title bar.	2019-05-24 21:54:52 +02:00
omar	fda1365c15	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-05-23 00:04:25 +02:00
omar	b85e97137d	Version tag is 1.71 WIP oops	2019-05-22 23:56:26 +02:00
omar	04022114d9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-05-21 14:47:29 +02:00
omar	34b881eb12	ImFontGlyphRangesBuilder: Fixed unnecessarily over-sized buffer, which incidentally was also not fully cleared. Fixed edge case overflow when adding character 0xFFFF. (#2568 )	2019-05-21 12:45:27 +02:00
omar	4158cba1ff	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h	2019-05-13 19:23:18 +02:00
omar	d3a387cc18	Fixed InputFloatX, SliderFloatX, DragFloatX functions erroneously reporting IsItemEdited() multiple times when the text input doesn't match the formatted output value (e.g. input "1" shows "1.000"). It wasn't much of a problem because we typically use the return value instead of IsItemEdited() here. (#1875 , #2034 )	2019-05-13 19:04:57 +02:00
omar	632469d2e5	Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.	2019-05-13 15:11:25 +02:00
omar	ef13d95466	IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c). Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538, #2541)	2019-05-11 10:33:56 +02:00
omar	835a8b2c9b	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-05-10 22:56:43 +02:00
omar	e29176df53	Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.	2019-05-09 13:12:09 +02:00
omar	239c8732d7	Viewports: Minor tweaks. (#2471 )	2019-05-08 18:33:08 +02:00
omar	42fc563fed	Version 1.71 WIP + fixed minor typo	2019-05-07 16:36:08 +02:00
omar	d1d5075b66	Version 1.70	2019-05-06 14:17:39 +02:00
omar	76e61958fd	Merge branch 'master' into docking # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2019-05-06 10:16:43 +02:00
omar	526e2303bc	Window: Fixed SetNextWindowSizeConstraints() with non-rounded positions making windows drift. (#2067 , #2530 )	2019-05-03 19:09:44 +02:00
omar	9c1f02a42c	Misc: Made IMGUI_CHECKVERSION() macro also check for matching size of ImDrawIdx.	2019-05-03 18:42:53 +02:00
omar	2dc81057ec	Selectable: With ImGuiSelectableFlags_AllowDoubleClick doesn't return true on the mouse button releas efollowing the double-click. Only first mouse release + second mouse down (double-click) returns true. Likewise for internal ButtonBehavior() with both _PressedOnClickRelease \| _PressedOnDoubleClick. (#2503 )	2019-05-03 14:31:12 +02:00
omar	825b61e4ba	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp # imgui.cpp	2019-05-02 14:56:47 +02:00
omar	5c1cd5c8c7	ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037 , #1639 , #2452 )	2019-04-30 22:15:59 +02:00
omar	3fbc0b7a9e	Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.	2019-04-29 18:33:08 +02:00
omar	dfb82d5c22	Merge branch 'master' into docking # Conflicts: # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # imgui.cpp	2019-04-25 17:53:11 +02:00
omar	6db0766564	Misc comments, internal renaming, added disable indentation option to Columns demo section.	2019-04-24 17:40:07 +02:00
omar	d0fb547dc1	Viewports: Avoid rendering/swapping secondary viewports that are minimized. (#1542 , #2496 )	2019-04-22 11:46:04 +02:00
omar	16e9b8191b	Increased IMGUI_VERSION_NUM arbitrarily, help narrowing down reports that don't include a commit hash. Add comments.	2019-04-22 11:16:17 +02:00
omar	03b64defa5	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-04-19 19:52:45 +02:00
omar	5078fa208b	Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.	2019-04-18 18:29:28 +02:00
omar	f355a40367	Added commentary about ContentRegion functions. Added internal GetContentRegionMaxScreen() to facilitate internal code at the moment.	2019-04-18 15:46:13 +02:00
omar	1aeee9d40f	Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows. Renamed SameLine() first parameter.	2019-04-17 22:12:17 +02:00
omar	9c364b16ff	Merge branch 'vulkan_fix_master' into vulkan_fix_docking	2019-04-05 20:30:42 +02:00
omar	c8fd4afd75	Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.	2019-04-05 20:20:24 +02:00
omar	bd351e9ac5	Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.	2019-04-05 20:20:08 +02:00
omar	d61caf5714	Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. (#2461 , #2348 , #2378 , #2097 )	2019-04-05 18:52:45 +02:00
omar	49fb8e6c45	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp	2019-04-03 11:17:26 +02:00
omar	512d39d031	Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.	2019-03-29 16:17:30 +01:00
omar	a33d45d7cd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-03-28 15:48:25 +01:00
omar	fd5859ed04	Docking: Separating SharedFlags vs LocalFlags in dock node so settings can be applied to individual nodes. Made _NoResize logic on single node applies as expected. (#2423 , #2109 )	2019-03-27 19:00:36 +01:00
omar	04a9ce3a18	Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109 )	2019-03-27 16:16:31 +01:00
omar	20188b19d6	Comments (#2441 ) + Freeglut fixes (#2430 )	2019-03-26 12:16:23 +01:00
omar	9350158d61	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	2019-03-25 16:08:09 +01:00
omar	c7619d4a6a	Docking: Preserve existing docked nodes when setting the ImGuiDockNodeFlags_NoDockingInCentralNode flag. (#2423 , #2109 )	2019-03-18 09:48:00 -07:00
omar	221bf93a55	Comments, todo list, remove trailing spaces.	2019-03-17 00:56:21 +01:00
omar	857381b9ca	GetMouseDragDelta(): also returns the delta on the mouse button released frame. Verify that mouse positions are valid otherwise returns zero. Removed obsolete comment. Tweaked demo. (#2419 )	2019-03-15 15:03:37 +01:00
omar	cf2c52282d	Version 1.70 WIP	2019-03-15 13:07:30 +01:00
omar	b1af4d36ce	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp	2019-03-13 15:30:35 +01:00
omar	55c02099c5	Version 1.69, comments, typos	2019-03-13 15:29:43 +01:00
omar	9afb849e16	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp	2019-03-12 18:28:47 +01:00
omar	a92c587c75	Added GetGlyphRangesVietnamese() helper. (#2403 )	2019-03-11 22:02:59 +01:00
omar	f7db4fad31	Merge branch 'master' into docking # Conflicts: # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui.cpp	2019-03-11 16:08:16 +01:00
omar	3eedb542a6	Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.	2019-03-11 11:07:23 +01:00
Bruce Mitchener	17c567c3a9	Don't use const qualified parameters in declarations. This fixes warnings from clang-tidy like this: parameter 'v_max' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions Since values (rather than references or pointers) don't need to be const, they don't need to be marked that way in the function declaration.	2019-03-08 18:21:11 +01:00
Haldean Brown	79bb4ce128	Added ImGuiColorEditFlagsFlags_InputHSV. (#2383 , #2384 )	2019-03-08 18:16:41 +01:00
omar	66936880ba	Moved placeholder sections to match Docking branch. Comments.	2019-03-08 18:16:41 +01:00
Bruce Mitchener	3b11505481	Fix typos. (#2411 )	2019-03-08 17:52:32 +01:00
omar	d77d3416d3	Merge branch 'master' into docking	2019-03-07 18:40:55 +01:00
omar	1c23981782	Made ImS8 and ImS16 explicitly signed in case some crazy SDK decide to flip the signedness over. (#2408 )	2019-03-07 16:10:44 +01:00
omar	e91d275b10	Merge branch 'master' into docking # Conflicts: # imgui_demo.cpp	2019-03-06 21:18:46 +01:00
Lucas Lazare	ab80ee6453	Added InputTextWithHint() (#2400 ) Squashed commit of the following: commit 1970d84051d3878f8c1354d9c33c795d9c66143f Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 12:20:39 2019 -0500 Removing sneaky tabulations #2 (why, editor T-T) I should update my settings, I guess commit 219bdfcb7fbd17edf3048cb0edfde2532e4d6ac3 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 12:17:27 2019 -0500 Removing useless check introduced in b0d172 commit 8afd7a2b459df0eb14eca88d832d2bebd1e684e6 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:49:24 2019 -0500 Removing sneaky tabulations commit 8e0490863126d63cafc782a6aac8707e44f95653 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:45:13 2019 -0500 Moving InputTextHinted code to InputTextEx commit b0d1723a2fb02d17ba15b9c1e679dedbbe3c17fd Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 00:23:02 2019 -0500 C++11 to C++98 commit 9afeae399826015357962607b4aeb0109fde698e Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Mon Mar 4 23:43:28 2019 -0500 Added InputTextHinted	2019-03-06 17:33:05 +01:00
David Maas	8b8ab1db5b	Removed redundant declaration of SetNextWindowClass. (#2402 )	2019-03-06 09:39:16 +01:00
omar	e02d6014bf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-03-05 22:13:38 +01:00
omar	ce4e62649a	Internal: Tabbing: Tweaks to FocusableItemRegister and using the standard mechanism to allow/block Tab being interpreting by tabbing instead of InputText() widget.	2019-03-05 18:24:59 +01:00
omar	622a27506a	Text: Fixed large Text/TextUnformatted call not declaring its size when starting below the lower point of the current clipping rectangle. Somehow this bug has been there since v1.0! It was hardly noticeable but would affect the scrolling range, which in turn would affect some scrolling request functions when called during the opening frame of a window.	2019-03-05 15:23:11 +01:00
omar	f4dd990e38	Comments and Issue Template	2019-03-05 11:03:32 +01:00
omar	8414c0bb09	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-03-04 18:08:19 +01:00
omar	94e794f81b	Renamed GetOverlayDrawList() to GetForegroundDrawList() for consistency. Kept redirection function (will obsolete). (#2391 ) Demo: Using GetBackgroundDrawList() and GetForegroundDrawList() in "Custom Rendering" demo.	2019-03-04 16:35:50 +01:00
omar	96b13760d4	Added GetBackgroundDrawList() helper to quickly get access to a ImDrawList that will be rendered behind every other windows. (#2391 )	2019-03-04 16:10:51 +01:00
omar	ff0c6c2bde	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-27 19:00:09 +01:00
omar	736d3e2654	DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. (#643 , #320 , #708 , #1011 )	2019-02-27 18:16:03 +01:00
omar	525a53a86b	Comments	2019-02-27 17:26:18 +01:00
omar	6de09a5e48	Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. (#2384 ) [@haldean]	2019-02-27 16:45:58 +01:00
haldean	8a2f6866a6	add _Show prefix to color flags that control inputs, rename __InputsMask to __ShowMask This is anticipation of changing __InputsMask to control the format of input colors, and adding _InputRGB and _InputHSV to change how input colors are interpreted.	2019-02-27 16:24:15 +01:00
omar	8915f7933a	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-02-24 23:24:07 +01:00
omar	cd67d4d3c1	Log/Capture: Fixed LogXXX functions 'auto_open_depth' parameter being treated as an absolute tree depth instead of a relative one. Fixed CollapsingHeader trailing ascii representation being "#" instead of "##". Minor tidying up the of code.	2019-02-23 16:07:01 +01:00
omar	87ded34f9f	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-02-22 12:29:18 +01:00
omar	257f5d204e	Version 1.69 WIP	2019-02-20 00:11:36 +01:00
omar	9dc02464a4	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-02-19 13:04:35 +01:00
omar	3c15dffc94	Version 1.68	2019-02-19 12:50:46 +01:00
omar	5bf9029bf9	Merge branch 'master' into docking	2019-02-18 12:16:13 +01:00
omar	f977871854	ImFont: Minor adjustment to the structure. Examples: Removed unused variable.	2019-02-15 18:56:08 +01:00
omar	09c9bf2edb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +01:00
omar	76dbff37cd	Selectable: Tweaks for #2347 (demo, changelog, member position)	2019-02-14 20:29:50 +01:00
haldean	b277cfffc8	Selectable: add support for specifying text alignment on selectables (#2347 ) Adds a style variable to Selectable that allows clients to specify the text alignment within Selectables, adds a section in the demo to demonstrate selectable text alignment, and a pair of sliders in the style editor to change selectable alignment on the fly. In terms of implementation, this one is extremely simple: Selectable was already calling an API that supports text alignment, but had hard-coded it to top-left. This changes that to just pass the style variable straight through to RenderTextClipped. Backwards-compatibility is preserved by defaulting the text_align parameter to (0, 0), i.e., top-left. This also fixes a bug with selectable text rendering that caused right-aligned text in a selectable to be clipped incorrectly, because the wrong clipping rectangle was being used.	2019-02-14 19:38:57 +01:00
omar	57a586b4f1	Font: Moved functions to internal block (not enforced). Made ConfigData pointer const. Added link to stb's notes.	2019-02-13 18:21:21 +01:00
omar	0640b6e67c	Shallow tweaks	2019-02-12 22:15:19 +01:00
omar	2cada3c143	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_widgets.cpp	2019-02-11 18:59:49 +01:00
omar	a79785c0b9	ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale). This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306, #1676) Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale. Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.	2019-02-11 18:52:08 +01:00
omar	4b41d3b280	ImFont: Rearranged members toward an optimal CalcTextSize() loop. Removed comments from destructor. Made constructor more explicit.	2019-02-09 15:54:47 +01:00
omar	4a3a895be9	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	e3dd95d335	Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. (#820 , #956 , #1875 )	2019-02-06 11:52:42 +01:00
omar	be107ba8f8	Merge branch 'master' into docking # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-02-05 13:52:32 +01:00
omar	d38f4dc143	Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. (#261 , #351 )	2019-02-05 13:23:44 +01:00
omar	d93e3c17fc	ImGuiTextBuffer: Fix size() to allow using ImGuiTextBuffer with resize(0) patterns.	2019-02-05 13:16:23 +01:00
omar	ac6d474103	Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).	2019-02-01 16:37:07 +01:00
omar	a608156da3	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-02-01 11:19:26 +01:00
omar	52a9f8bd3e	Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.	2019-02-01 10:26:08 +01:00
omar	699e945a82	Merged from Docking branch: non-const ImVec2[] operator.	2019-02-01 10:22:46 +01:00
omar	f906d53f7d	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-31 19:19:35 +01:00
Michael Savage	2d363fa315	Fixed doc typo (#2326 )	2019-01-31 14:19:15 +01:00
omar	e1143377c2	Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. (#1542 , #2117 ) Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.	2019-01-30 21:39:05 +01:00
omar	86d3bba157	Added ImGuiDockNodeFlags_AutoHideTabBar. (#2109 )	2019-01-29 18:28:31 +01:00
omar	13a5f5ba8b	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	b26ac92a12	Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)." This reverts commit `20bc06af70`.	2019-01-27 16:43:56 +01:00
omar	ee3b4f2bf1	Using IM_UNUSED() macro.	2019-01-27 16:23:23 +01:00
omar	c3c2cd1e82	Fix various XCode and PVS-Studio static analyzer warnings (#2309 )	2019-01-27 16:18:23 +01:00
omar	20bc06af70	Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).	2019-01-27 16:18:23 +01:00
omar	0947fa3de0	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-01-21 16:54:37 +01:00
omar	cb9a6b8a8b	Merge branch 'master' into viewport # Conflicts: # examples/README.txt # imgui.cpp	2019-01-21 16:52:22 +01:00
omar	28901dd104	Internals: Tweaks. Comments about PushID/GetID public function.	2019-01-21 16:50:27 +01:00
omar	00ffdb9fa9	ImGuiTextBuffer: Added append() function (unformatted).	2019-01-20 22:21:26 +01:00
omar	f94af2f5c5	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp	2019-01-20 22:13:35 +01:00
omar	8079344cee	Merge branch 'master' into viewport # Conflicts: # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.h # imgui.cpp	2019-01-20 22:12:06 +01:00
omar	2c38b32db1	Removed trailing spaces (#2038 , #2299 )	2019-01-20 17:56:17 +01:00
omar	f94ba546ba	Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299 , followup to #2277 )	2019-01-20 17:46:00 +01:00
omar	b5144e477f	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt	2019-01-17 14:06:42 +01:00
omar	e9c625a1dc	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp	2019-01-17 14:05:40 +01:00
omar	09f1cb642b	FreeType: Minor tweaks previous commit (#2285 )	2019-01-15 21:50:43 +01:00
omar	8a45c56c2c	Merge branch 'viewport' into docking	2019-01-15 21:22:29 +01:00
omar	9391a97fbf	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h	2019-01-15 21:22:21 +01:00
omar	79d497edae	Viewport: Made platform_io.Monitors mandatory for proper multi-viewport use.	2019-01-15 21:20:00 +01:00
omar	95ee99e6aa	Version 1.68 WIP	2019-01-15 20:19:05 +01:00
omar	ff4bd758ca	Merge branch 'viewport' into docking	2019-01-14 21:30:07 +01:00
omar	e24674fc0e	Merge branch 'master' into viewport	2019-01-14 21:30:01 +01:00
omar	7a5058e3bf	Version 1.67	2019-01-14 17:41:44 +01:00
omar	6e41745f31	Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277 )	2019-01-13 18:57:46 +01:00
omar	529fccd9c2	Merge branch 'viewport' into docking	2019-01-13 14:19:40 +01:00
omar	4ee4f65c70	Merge branch 'master' into viewport	2019-01-13 14:19:31 +01:00
omar	abdd39b700	Merge branch 'atlas_fixes'	2019-01-13 14:19:07 +01:00
omar	49994ceb6e	FAQ entry, moved ImTextureId, Gallery links.	2019-01-12 19:48:07 +01:00
omar	9a9712807e	ImFontAtlas: Rewrote stb_truetype based builder. - Atlas width is now properly based on total surface rather than glyph count (unless overridden with TexDesiredWidth). - Fixed atlas builder so missing glyphs won't influence the atlas texture width. (#2233) - Fixed atlas builder so duplicate glyphs (when merging fonts) won't be included in the rasterized atlas.	2019-01-10 22:23:05 +01:00
omar	7ed8e55fc7	ImVector: Added size_in_bytes() helper.	2019-01-10 16:10:02 +01:00
omar	8011197c50	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2019-01-10 16:02:32 +01:00
omar	c96aaef132	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2019-01-10 16:01:36 +01:00
omar	e4c19f5af1	ImFontGlyphRangesBuilder: Using 32-bits fields for storage instead of 8-bit ones, comments, todo.	2019-01-10 16:00:26 +01:00
omar	7ffbcfe467	ImVector: Made reserve() another silly one-liner. It's not longer than other functions and our weird obsessions deserve to be carried with stringent consistence. + Comments	2019-01-10 15:51:09 +01:00
omar	1f6e0b2f98	ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal).	2019-01-10 15:51:08 +01:00
omar	9ad341902d	ImDrawList: Optimized some of the functions for performance of debug builds where non-inline function call cost are non-negligible.	2019-01-08 17:37:22 +01:00
omar	6b32570644	Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-01-07 21:29:15 +01:00
omar	5af930f97a	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-07 21:28:29 +01:00
omar	1ae7f88495	Tabs: Added ImGuiTabBarFlags_NoTooltip flag. (#261 , #351 ) + added helpful assert	2019-01-07 18:07:09 +01:00
omar	5cb7ce2085	Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).	2019-01-06 16:59:51 +01:00
omar	1353c74dcf	Comments/formatting on obsolete stuff	2019-01-06 16:37:57 +01:00
omar	c3af134cc8	IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.	2019-01-06 16:37:42 +01:00
omar	1705a81efb	Moved ImVector higher up in imgui :( because we will need it in ImGuiIO.	2019-01-06 16:29:40 +01:00
omar	9ba202821f	Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. (#787 )	2019-01-04 19:03:56 +01:00
omar	d223d1e951	Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.	2019-01-04 18:01:43 +01:00
omar	4e98d4329b	Comments	2019-01-03 21:59:13 +01:00
omar	5278da98d2	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_demo.cpp	2019-01-03 21:40:08 +01:00
omar	e1ed27aeaa	(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! (#1542 )	2019-01-03 21:33:33 +01:00
omar	c8349d3305	Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.	2019-01-03 21:28:54 +01:00
omar	ce1626a51e	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-02 21:36:21 +01:00
omar	0cabe4dedf	Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. (#1542 )	2019-01-02 21:33:23 +01:00
omar	0d6e3ab2b0	Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)	2019-01-02 21:28:16 +01:00
omar	4a6f95acc8	Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.	2019-01-02 19:03:36 +01:00
omar	5305c32242	Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.	2019-01-02 19:03:11 +01:00
omar	951c9dd68b	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2019-01-02 19:00:31 +01:00
omar	e194219f2e	Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109 )	2019-01-02 16:22:44 +01:00
omar	acacd93836	Renamed extra_flags to flags in InputXXX parameters.	2019-01-02 11:08:14 +01:00
omar	6b97ded438	Happy new year! & comments	2019-01-02 10:57:57 +01:00
omar	e043b89814	Merge branch 'viewport' into docking # Conflicts: # imgui.h	2018-12-20 17:03:21 +01:00
omar	8fc19d2194	Removed IMGUI_HAS_TABS from Docking branch, it's not defined anywhere anymore.	2018-12-20 16:56:48 +01:00
omar	02501f07c3	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2018-12-20 16:54:32 +01:00
omar	a0e5bb9532	Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.	2018-12-20 16:49:31 +01:00
omar	39dde66b21	IO: Realigned all fields, very minor comments change. This is nearly a no-op if you don't ignore Spaces.	2018-12-20 11:48:52 +01:00
omar	5691385a33	IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. (#2004 + for cimgui)	2018-12-20 11:41:24 +01:00
omar	89ac0ea7c1	Various user-facing comments	2018-12-19 11:19:55 +01:00
omar	088ef6623a	Merge branch 'viewport' into docking	2018-12-18 15:03:01 +01:00
omar	9c916cdaf9	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-12-18 15:02:35 +01:00
omar	ac9512e095	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2018-12-14 18:46:24 +01:00
omar	f1c7596409	Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.	2018-12-14 18:42:22 +01:00
omar	5d20da1b36	Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. (#1676 )	2018-12-14 12:12:26 +01:00
omar	9b09c7597f	Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp	2018-12-13 19:21:51 +01:00
omar	2a1e903f43	Merge branch 'master' into viewport # Conflicts: # imgui.h	2018-12-13 19:20:34 +01:00
omar	8497948ba0	Comments, minor tweaks.	2018-12-13 19:17:36 +01:00
omar	991b16cc6a	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_widgets.cpp	2018-12-11 19:46:46 +01:00
omar	ccce47c6a2	Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.	2018-12-11 18:10:43 +01:00
omar	067b691fd8	Merge branch 'viewport' into docking # Conflicts: # docs/TODO.txt # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_draw.cpp # imgui_internal.h # imgui_widgets.cpp	2018-12-11 13:23:00 +01:00
omar	c40feabe4d	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-11 12:41:40 +01:00
omar	54a60aaa40	Added BETA api for Tab Bar/Tabs widgets. (#261 , #351 ) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature) - Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API. - Added ImGuiTabBarFlags flags for BeginTabBar(). - Added ImGuiTabItemFlags flags for BeginTabItem(). - Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors. - Demo: Added Layout->Tabs demo code. - Demo: Added "Documents" example app showcasing possible use for tabs.	2018-12-11 12:36:47 +01:00
omar	cc1283fb78	Added ImGuiWindowFlags_UnsavedDocument window flag to append '*' to title without altering the ID, as a convenience to avoid using the ### operator. (merged from Docking branch)	2018-12-11 12:20:48 +01:00
omar	15447f5b7b	Using named flags instead of 0 + shallow formatting tweaks from other branches.	2018-12-11 12:14:27 +01:00
omar	e6439e1a16	Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp	2018-12-10 16:21:49 +01:00
omar	26b9e2d0a5	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_demo.cpp	2018-12-10 16:14:31 +01:00
omar	9476e07d5a	Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. (#899 ) Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height.	2018-12-10 16:05:30 +01:00
omar	59f3c4fc20	Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do.	2018-12-10 15:41:01 +01:00
omar	f768727284	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2018-12-06 16:36:17 +01:00
omar	a03846bd9e	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-06 16:33:39 +01:00
omar	f3a0b17bb8	Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. (#1542 , #2117 ) + various comments.	2018-12-06 16:30:10 +01:00
omar	b96b1f2412	Docking: Documenting an issue. Renamed member of ImGuiDockFamily.	2018-12-04 16:38:27 +01:00
omar	b58bd5b311	Version 1.67 WIP + todo notes	2018-12-04 13:49:29 +01:00
omar	6644f1ff64	Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes). Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those.	2018-12-04 13:37:46 +01:00
omar	5105c6c0d0	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2018-12-04 00:06:26 +01:00
omar	3a678d48b1	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp	2018-12-04 00:05:45 +01:00
omar	f6b6ad1959	Viewport: Minor tweaks, better struct layout.	2018-12-03 20:30:00 +01:00
omar	eb311abc92	Fixed IMGUI_API tag on ImFontAtlas::IsBuilt() preventing to build as DLL on some setups. (#2226 )	2018-12-03 17:49:38 +01:00
omar	10e13dd6bb	Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).	2018-12-03 12:19:23 +01:00
omar	ac10889bde	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt	2018-12-03 11:44:51 +01:00
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	7658035e5a	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:30:21 +01:00
omar	3849def253	Added ShowAboutWindow(), About Window now showing various config/build information.	2018-11-30 18:30:21 +01:00
omar	f78b5a0cdb	Merge branch 'viewport' into docking	2018-11-30 18:27:14 +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	a423f032ee	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:18:15 +01:00
omar	4ef06f5aa2	Added ShowAboutWindow(), About Window now showing various config/build information.	2018-11-30 18:02:01 +01:00
omar	4a94b251fd	Comments	2018-11-29 22:00:17 +01:00
omar	3c114b280a	Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h	2018-11-29 21:30:26 +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	19d17ed274	Docking: Added io.ConfigDockingTransparentPayload option (to use with ImGuiConfigFlags_ViewportsNoMerge)	2018-11-29 16:18:01 +01:00
omar	3bcc25f588	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h	2018-11-27 19:56:23 +01:00
omar	4cadb57c46	Viewport: Comments.	2018-11-27 19:53:33 +01:00
omar	99c32ed4a5	Merge branch 'master' into viewport	2018-11-27 19:46:40 +01:00
omar	4105cc7e97	Added ImGuiConfigFlags_None, ImGuiBackendFlags_None for good measure.	2018-11-27 19:46:14 +01:00
omar	1fa2cb8748	imgui.h: Comments	2018-11-27 14:10:40 +01:00
omar	ce07d55d1b	imgui.h: Moved ImGuiListClipper	2018-11-27 14:01:07 +01:00
omar	8495c931c0	mgui.h: Moved ImGuiInputTextCallbackData,, ImGuiSizeCallbackData, ImGuiPayload structures so they are not in the "Helpers" section.	2018-11-27 14:01:07 +01:00
omar	962dcb466d	Docking: Added ImGuiDockNodeFlags_NoResize. (#2109 )	2018-11-26 21:52:40 +01:00
omar	b8d9c5c130	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2018-11-26 21:36:48 +01:00
omar	12a1e7d04e	Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.	2018-11-26 19:20:37 +01:00
omar	ddc3f8f069	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h	2018-11-26 15:32:04 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	131de7ab62	Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109 )	2018-11-23 18:42:16 +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	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	2515413080	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_widgets.cpp	2018-11-22 15:29:18 +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	4a43f347bb	Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_marmalade/main.cpp	2018-11-15 14:00:01 +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	19b4fcdacb	Made IsWindowFocused() work outside of NewFrame()-EndFrame() and added comments about how ImGuiFocusedFlags_AnyWindow should NOT be used in place of io.WantCaptureMouse. (#2185 )	2018-11-13 11:23:15 +01:00
omar	168af9b377	Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp	2018-10-25 23:45:19 +02:00
omar	50f6e12d31	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-10-25 23:41:13 +02:00
Konstantin Podsvirov	faecf90383	SliderAngle: Added optional `format` argument to allow users customize precision and make localization. (#2150 )	2018-10-25 22:29:29 +02:00
omar	a72d5ada61	Misc comments improvements	2018-10-25 19:02:43 +02:00
omar	c547b2e8ee	Added DockSpaceOverViewport() call, not sure about this because of the menu bar limitation. (#2109 )	2018-10-25 15:34:53 +02:00
omar	5f8c9ae0ef	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:57:54 +02:00
omar	056af2b1af	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:56:26 +02:00
omar	000c1fc221	Demo: Added comments / tweaks related to the popups.	2018-10-16 10:25:32 +02:00
omar	5be915d6ab	Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. (#1660 , #787 )	2018-10-15 18:23:18 +02:00
omar	90b50bd4c3	Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660 )	2018-10-15 18:16:49 +02:00
omar	69db792bf0	Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. (#1542 , #1660 , #1878 , etc.)	2018-10-15 17:38:36 +02:00
Elias Daler	8606d9fa11	Fix Clang/GCC's null-conversion warning: (#2081 ) The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example.	2018-10-15 17:07:06 +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	c398153b40	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h	2018-10-12 13:01:20 +02:00
omar	0fe48cbb61	Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035 , #2096 ) Added misc/README file.	2018-10-12 11:16:51 +02:00
omar	74c0309126	InputText: Clarified comments around ImGuiInputTextFlags_CallbackResize and other callbacks. (#2006 , #1443 , #1008 )	2018-10-12 10:34:58 +02:00
omar	d02b11dfbd	ImGuiTextBuffer: Avoid heap allocation when empty.	2018-10-11 12:08:09 +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	3a7828de6b	Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542 )	2018-10-09 18:35:45 +02:00
omar	7b3433c68b	Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542 )	2018-10-09 18:33:39 +02:00
omar	84507cc744	Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109 )	2018-10-08 12:37:10 +02:00
omar	407822e6a5	BeginTabItem: Fixed missing parameter name in .h file messing up with cimgui generator. (#2115 )	2018-10-04 19:39:02 +02:00
omar	4e30698706	Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109 )	2018-10-03 22:32:23 +02:00
omar	2dd8338e7d	Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109 )	2018-10-03 18:30:36 +02:00
omar	d348d86df4	Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109 )	2018-10-03 17:50:07 +02:00
omar	1d3862b6b3	Docking: Added ImGuiDockNodeFlags_NoDockingInsideDocRootNode flag. Honoring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. (#2109 )	2018-10-03 14:57:28 +02:00
omar	bd82539ad5	Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109 )	2018-10-03 14:42:47 +02:00
omar	83f55c9de5	Merge branch 'viewport' into docking	2018-10-02 18:55:48 +02:00
omar	33b88a0339	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-10-02 18:55:36 +02:00
omar	2cff3f6a65	Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.	2018-10-01 18:35:21 +02:00
omar	e623be998d	Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143 )	2018-10-01 15:53:18 +02:00
omar	4e717b524c	Docking: Fixes for C++03 compilers.	2018-10-01 10:40:43 +02:00
omar	9cfc40c2cc	Docking: Demo: Displaying a message if master docking flag is disabled. + DockSpace() early out + comments.	2018-09-30 23:39:37 +02:00
omar	35d1fb7b34	Style: Added style.TabRounding setting.	2018-09-30 18:41:07 +02:00
Loïc HAMOT	9aae21483a	Fix missing IMGUI_API and mismatching namespace internal's CreateNewWindowSettings (#2105 )	2018-09-27 12:59:22 +02:00
omar	c6193d0605	Merge branch 'viewport' into docking	2018-09-26 21:35:09 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	61d94ff88e	Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).	2018-09-26 21:30:37 +02:00
omar	a7d3ae8937	BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698 , #894 , #713 ) + reworked the Begin/BeginChild comments in imgui.h.	2018-09-26 21:24:42 +02:00
omar	45731cca19	Docking: Added DockBuilderForkNode() primitive for usage for user code to fork/copy entire layouts. This will probably need to be added to as I find ways to migrate patterns from user code to the library. Added IMGUI_DEBUG_DOCKING_INI helper to facilitate debugging. (+1 squashed commits)	2018-09-26 17:11:37 +02:00
omar	dc92431328	Docking: Minor renaming. DockContextAddNode() uses 0 as marker for automatic ID selection + TODO update and moved docking entries to docs/TODO.txt	2018-09-26 12:58:14 +02:00
omar	d3e8e5731a	Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().	2018-09-25 17:45:06 +02:00
omar	53a5d32df1	Docking: Reworked SetNextWindowUserType() as SetNextWindowDockFamily(), allowing multiple scene to be tagged with their scene id and not receive tabs from other scene + persistent storage for family id to allow for docking tree fork/remap.	2018-09-25 16:15:25 +02:00
omar	781a7950d7	ImVector: Fixed a oddly unqualified return type in the assignment operator (I assume C++ handles it nicely as this never warned anywhere, but it is completely unintentional).	2018-09-24 11:33:26 +02:00
omar	3e47978a80	Docking: Renamed ImGuiDockSpaceFlags to ImGuiDockNodeFlags. Clarified in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.	2018-09-20 09:52:51 +02:00
omar	b55b9aee9b	Fixed bad merge (`a82be53`) where we lost the version number in Docking branch + moved Docking related API together for now.	2018-09-14 18:09:46 +02:00
omar	0f1c21a6c9	Docking: Changed DockSpace() signature to take an ID, as ID will frequently be used by other API it makes more sense to let the user compute it.	2018-09-14 18:09:04 +02:00
omar	e32256b4b4	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_demo.cpp # imgui_internal.h	2018-09-14 11:38:10 +02:00
omar	b85f345369	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp	2018-09-14 11:32:55 +02:00
ice1000	201fcfd2e5	Internals: Replace unsigned short with ImWchar when dealing with character storage. (#2078 )	2018-09-11 22:00:57 +02:00
omar	211a9c8fd2	Docking: Added ImGuiDockSpaceFlags_KeepAliveOnly, important for multiple level of tabs. (also renamed ImGuiDockFlags to ImGuiDockSpaceFlags.)	2018-09-11 17:58:09 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	a68c98bb67	Docking: Added SetNextWindowUserType() + user type filtering in dockspace and window merging. Added DockSpace() flag ImGuiDockFlags_NoSplit. Renaming. Reworked the DockNodeUpdateFindOnlyNodeWithWindows code so DockNodeUpdate can access the first window.	2018-09-10 14:32:00 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
omar	a82be53407	Merge branch 'docking2' into viewport_docking # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2018-09-06 22:28:21 +02:00
omar	bd5b38e232	Docking: Added Docking system. Enable with io.ConfigFlags \|= ImGuiConfigFlags_DockingEnable. (Part 1) (#351 )	2018-09-06 21:45:46 +02:00
omar	2ec135c9f7	Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.	2018-09-06 21:45:45 +02:00
omar	58d46e1fe6	Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261 , #351 )	2018-09-06 21:45:44 +02:00
omar	741bdf151a	Added ImGuiWindowFlags_UnsavedDocument flags.	2018-09-06 21:45:10 +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	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
omar	048add5ef2	ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879 )	2018-07-19 15:22:18 +02:00
omar	7b4fbf4301	Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542 )	2018-07-17 16:37:10 +02:00
omar	88df66ec83	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h # imgui_draw.cpp # imgui_internal.h	2018-07-12 10:03:18 +02:00
omar	23288547ec	Revert part of `c7016c2` incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939 )	2018-07-12 09:53:10 +02:00
omar	59fb3274a7	Examples: include for intptr_t on tdm-gcc + mingw32 (#1936 ) + mouse buttons comments	2018-07-11 20:03:47 +02:00
omar	9007dff5eb	IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940 , #211 ) + shallow changelog tweaks	2018-07-10 19:16:57 +02:00
omar	17f36038e0	Internals: Misc/shallow merge from Docking branch.	2018-07-09 21:10:47 +02:00
omar	574185426c	Internals: Misc/shallow merge from Docking branch.	2018-07-09 21:06:46 +02:00
omar	dd61c4802a	Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787 )	2018-07-09 19:22:49 +02:00
omar	c7016c25e8	Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787 )	2018-07-09 19:16:48 +02:00
omar	14cef31467	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-07-09 16:24:01 +02:00
omar	a33f0d1f7f	Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143 )	2018-07-08 16:38:57 +02:00
omar	6277781e83	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-07-08 13:08:16 +02:00
omar	42bf149ac6	Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor `io.OptResizeWindowsFromEdges=true` to enable the feature globally. (#1495 ) The feature is not currently enabled by default because it is not satisfying enough.	2018-07-06 15:30:21 +02:00
omar	665bd1e140	Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.	2018-07-04 10:29:28 +02:00
omar	770cba0bd0	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h	2018-07-02 20:13:16 +02:00
omar	62b3d7c51e	Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913 , #1914 )	2018-06-29 16:36:40 +02:00
Aiekick	ecd9a223e3	add hand cursor support (+11 squashed commit)	2018-06-29 16:36:40 +02:00
omar	242d7e0b0b	ImVector: Added index_from_pointer() helper.	2018-06-28 18:37:38 +02:00
omar	7adae3299e	Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments	2018-06-27 17:29:31 +02:00
omar	c38fe6b0e1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-06-26 12:41:36 +02:00
omar	c1d8dee6c5	Version 1.63 WIP	2018-06-25 09:40:09 +02:00
omar	ce500f8727	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp	2018-06-22 12:01:42 +02:00
omar	1b74e3be02	Version 1.62	2018-06-22 09:41:25 +02:00
omar	cac4c3f9b8	Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. (#1888 ) + Comments in imgui.h	2018-06-21 12:04:00 +02:00
omar	70b0bd13aa	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # imgui.cpp # imgui.h	2018-06-14 15:30:15 +02:00
omar	ce0b36ba10	Added _None values to various enum flags, useful for readability and some coding style likes it. (Unfortunately we can't refer to them as default value in imgui.h functions because they need to be declared below).	2018-06-13 23:22:19 +02:00
omar	335f6fde7e	Comments + missing changelog bits in 1.52 for SetNextWindowPos, SetNextWindowPosCenter. (obsolete #771 )	2018-06-13 14:06:58 +02:00
omar	d57fc7fb97	Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. (#820 , #956 , #1875 )	2018-06-13 00:10:33 +02:00
omar	be4b8b5615	Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.	2018-06-13 00:02:19 +02:00
omar	cd455a4600	Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. (#820 , #956 , #1875 )	2018-06-12 18:44:33 +02:00
omar	24aeca3d0c	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp	2018-06-12 16:24:24 +02:00
omar	a48815b870	Comments, changelog	2018-06-12 12:12:56 +02:00
omar	9660657e95	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-06-10 15:59:35 +02:00
omar	689ec0bd06	Merge branch 'font_min_max_advance'	2018-06-10 15:07:18 +02:00
omar	13a3a2d0f3	Merge branch 'examples_refactor2' into viewport (#1870 ) # Conflicts: # examples/README.txt # examples/directx11_example/main.cpp # examples/directx12_example/main.cpp # 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_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl2.cpp # examples/imgui_impl_sdl2.h # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/sdl_vulkan_example/main.cpp # examples/vulkan_example/main.cpp # imgui.cpp # imgui.h	2018-06-10 15:04:46 +02:00
omar	ff4f40de41	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-06-08 20:22:07 +02:00
omar	85f9694bd4	Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). (#1870 ) Read examples/README.txt for some details. ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)	2018-06-08 19:37:33 +02:00
omar	f5bf9f509c	ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. (#1869 )	2018-06-08 12:52:46 +02:00
omar	24fc7c30dd	Examples: Documentation	2018-06-08 00:00:12 +02:00
omar	f63a404df0	Added missing IMGUI_API markers in non-inline section of the IMGUI_DISABLE_OBSOLETE_FUNCTIONS block: old Begin(), InputFloat().	2018-06-06 15:40:40 +02:00
omar	d44faa165a	Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. (#1859 ) Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.	2018-06-06 12:35:36 +02:00
omar	2a56105f85	TreeNodeEx(): The helper ImGuiTreeNodeFlags_CollapsingHeader flag now include ImGuiTreeNodeFlags_NoTreePushOnOpen. The flag was already set by CollapsingHeader(). The only difference is if you were using TreeNodeEx() manually with ImGuiTreeNodeFlags_CollapsingHeader and without ImGuiTreeNodeFlags_NoTreePushOnOpen. In which case you can remove the ImGuiTreeNodeFlags_NoTreePushOnOpen flag from your call (ImGuiTreeNodeFlags_CollapsingHeader & ~ImGuiTreeNodeFlags_NoTreePushOnOpen). (#1864 )	2018-06-06 11:39:29 +02:00
omar	93b032ea92	Merge branch 'master' into viewport # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp	2018-06-05 15:51:52 +02:00
omar	948009a8b2	Intensive FAQ answer for the million of people asking the same questions over and over again. (#1848 , #1791 , #1840 , #1493 , #1295 )	2018-05-30 16:31:34 +02:00
omar	92b7d6bc4f	Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143 )	2018-05-28 20:57:41 +02:00
omar	03c8a78f04	Merge branch 'master' into viewport # Conflicts: # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp	2018-05-25 12:44:56 +02:00
omar	002e513b82	Added float GetWindowDpiScale(). (#1542 , #1676 )	2018-05-23 18:25:37 +02:00
omar	bf56b6b9a5	ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. (#1826 )	2018-05-21 10:13:21 +02:00
omar	7c7e96e1aa	ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions	2018-05-18 23:00:48 +02:00
omar	01429e7d16	Merge branch 'master' into viewport # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h	2018-05-17 15:03:56 +02:00
omar	d5c8f404b2	Remove trailing white spaces.	2018-05-17 14:12:37 +02:00
omar	7f960616e0	Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. (#1542 )	2018-05-16 14:34:46 +02:00
omar	1cafdb5b46	Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. (#1542 )	2018-05-15 11:04:07 +02:00
omar	036dce634e	Version 1.62 WIP	2018-05-14 19:19:19 +02:00
Kirill Artemov	721ca97d95	ImVector: Tweaked reserve() flow to avoid calling MemFree(NULL) which is unnecessary. (#1796 )	2018-05-14 17:52:29 +02:00
omar	b0fb340b57	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-05-14 13:15:21 +02:00
omar	78b28d545f	Version 1.61 + todo additions	2018-05-14 12:34:47 +02:00
omar	f8ca7f45c4	Comments about AddConvexPolyFilled(), PathFillConvex() requiring a clockwise order path. (#1811 )	2018-05-13 15:55:15 +02:00
omar	85f3ba844c	Merge branch 'master' into viewport # Conflicts: # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h	2018-05-11 22:22:41 +02:00

... 8 9 10 11 12 ...

2210 Commits