imgui

mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 17:37:00 +00:00

Author	SHA1	Message	Date
omar	4b3c5ff5f1	Comments + minor moving	2020-01-11 16:08:17 +01:00
omar	861f786d81	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-01-10 14:38:09 +01:00
omar	1eb71fc72b	ButtonBehavior: Added ImGuiButtonFlags_PressedOnClickReleaseAnywhere behavior (#2971 ) Rearranged flags. Added tests in 'widgets_button_press'	2020-01-10 14:34:15 +01:00
omar	1db78b8ca7	Renaming + missing initialization + missing Changelog update.	2020-01-07 21:26:16 +01:00
Rokas Kupstys	32c33c6659	ColorEdit: Preserve last saturation value when V=0. Disable Hue editing lock. This workaround is no longer necessary because preserving hue value prevents it from resetting when it is edited in said condition.	2020-01-07 21:26:15 +01:00
omar	d581939387	Removed trailing spaces.	2020-01-06 15:24:16 +01:00
omar	07eb7adbb4	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-12-20 16:36:41 +01:00
omar	854fc08194	Amend `f70204f2` to facilitate merges.	2019-12-20 16:34:07 +01:00
omar	c706ff6f3a	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2019-12-18 20:49:41 +01:00
omar	a610f1da52	Bezier Tweaks, fixed parameter order of `3831d50`	2019-12-17 16:43:05 +01:00
Rokas Kupstys	3831d50ab9	Add ImBezierClosestPoint() function which returns a point on bezier curve which is closed to a specified point.	2019-12-17 16:22:02 +01:00
omar	10fdc03a46	Clarification about Im helpers + moving GetColorXXX functions outside of that block.	2019-12-17 13:19:36 +01:00
omar	992736dc5d	Merge branch 'refs/heads/master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2019-12-13 17:06:27 +01:00
omar	43bd80a40d	Internals: Breaking: ImRect() default constructor initializes all fields with 0.0f Instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). Previous behavior was designed for adding into a bounding box but rarely relied on and not worth it.	2019-12-13 11:56:00 +01:00
omar	e42c1e1668	Exposed IMGUI_DEBUG_PARANOID in imconfig.h + using a #define with no value to match other uses in imconfig.h	2019-12-08 16:12:44 +01:00
Ben Carter	697f15e339	Added PrimUnreserve() API. Obsoleted calling ImDrawList::PrimReserve() with a negative count.	2019-12-08 16:06:32 +01:00
omar	e4a59d0025	TabItem: honor ImGuiTabItemFlags_NoCloseButton passed as parameter (although undocumented and part of private api) (#2923 )	2019-12-07 16:22:07 +01:00
omar	f656e7775e	Inputs: Added ImGuiMouseButton enum for convenience (e.g. ImGuiMouseButton_Right=1). We forever guarantee that the existing value will not changes so existing code is free to use 0/1/2.	2019-12-06 16:29:36 +01:00
omar	927580d4a8	Docking: Cleanup, rename DockNodePreviewDockCalc() -> DockNodePreviewDockSetup()	2019-12-04 23:06:36 +01:00
omar	abaf0256b8	Version 1.75 WIP Added message to font file loading assert.	2019-11-28 20:58:16 +01:00
omar	a1e4af62d3	Docking: Fix bug added in `71a58261` + Misc docking omments	2019-11-28 20:52:46 +01:00
omar	71a58261f6	Docking: Internals: Removed redundancy in code path leading to the BeginAsDockableDragDropSource(), clarified UpdateMouseMovingWindowEndFrame() Note that the ConfigWindowsMoveFromTitleBarOnly path for UpdateMouseMovingWindowEndFrame() would previously test the window->RootWindow title bar instead of window->RootWindowDockStop. This didn't have any side effect afaik because we wouldn't enter that function anyway as clicking on any tab bar would trigger the move before UpdateMouseMovingWindowEndFrame() does it. However for consistency made the UpdateMouseMovingWindowEndFrame()code more correct. + minor renaming	2019-11-27 18:57:01 +01:00
omar	8d1b82d596	Docking: Internals: Rename StartMouseDragFromTitleBar() -> StartMouseMovingWindowOrNode(), clarify.	2019-11-27 15:51:15 +01:00
omar	a8092085b1	Internal: Added unused parameter named to facilitate cimgui parsing of imgui_internal.h https://github.com/cimgui/cimgui/issues/108	2019-11-27 14:02:05 +01:00
omar	813e0c18e6	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx12.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h	2019-11-26 12:23:43 +01:00
omar	bdce833636	Version 1.74	2019-11-25 18:38:53 +01:00
omar	bbe0409942	Metrics: Show wire-frame mesh and approximate surface area when hovering ImDrawCmd. Amend `aeb5795`. Internals: Added ImTriangleArea()	2019-11-25 12:01:04 +01:00
omar	b205ab01f2	Internals: Added IM_ASSERT_PARANOID, IMGUI_DEBUG_PARANOID define. Shuffled a bit of the macros section in imgui_internal.h	2019-11-22 14:45:44 +01:00
omar	a899c1e570	Internals: Using ImU64 for internal ImFile api so we can later wrap them to fseeko/ftello//_fseeki64/_ftelli64 (#2734 )	2019-11-20 10:40:14 +01:00
omar	ecbedc8c26	Tweaks, ammend `93efa54`, rename to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS (#1038 )	2019-11-19 21:29:12 +01:00
omar	4e90906b04	Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734 ) Using in Emscripten example.	2019-11-19 21:14:44 +01:00
omar	93efa5415f	Renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_STRING_FUNCTIONS. (#1038 ) Renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS.	2019-11-19 20:53:17 +01:00
omar	3895363432	Merge branch 'master' into docking inc alter GetWindowResizeID # Conflicts: # imgui.cpp	2019-11-18 13:58:50 +01:00
omar	ca30ef4269	Drag and drop: Increase local payload buffer from 8 to 16 bytes.	2019-11-15 18:36:06 +01:00
omar	7e232092a6	Internals: Added GetWindowResizeID(), renamed GetScrollbarID() to GetWindowScrollbarID(). Using integer for resize ID so they matches regardless of the pointer size. Internals: Renamed IMGUI_USER_ERROR to IM_ASSERT_USER_ERROR().	2019-11-15 16:59:43 +01:00
omar	a1e43c682a	Merge branch 'master' into docking (with fixes) # Conflicts: # imgui.cpp # imgui_internal.h	2019-11-15 15:32:36 +01:00
omar	be05e12e21	Misc: Using static_assert() when using C++11, instead of our own construct (avoid zealous Clang warnings).	2019-11-14 18:02:18 +01:00
omar	03852470de	Internals: Routing recoverable user errors via IMGUI_USER_ERROR() macro. (#1651 )	2019-11-13 21:58:18 +01:00
omar	25eee91542	Error handling: Assert if user mistakenly calls End() instead of EndChild() on a child window. (#1651 ) Internals: Moved some error handling code.	2019-11-13 21:51:38 +01:00
omar	b138f8cbcd	Internal: Nav rename preparing for nav inputs ownership changes. IsNavInputPressed() -> IsNavInputTest()	2019-11-13 21:02:25 +01:00
omar	c3fd4ae473	Docking: comments	2019-11-12 11:06:02 +01:00
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	011d475532	TreeNode: The collapsing arrow accepts click even if modifier keys are being held, facilitating interactions with multi-select patterns. (#2886 , #1896 , #1861 )	2019-11-08 15:30:15 +01:00
omar	d003674f2c	Internals: Added ImChunkStream, used by window settings. (more generic followup to `4c13807`, the class will be used more extensively by Tables)	2019-11-07 16:05:03 +01:00
omar	a337e219b6	Internals: ImPool: Renaming.	2019-11-07 16:04:51 +01:00
omar	28f1d60de1	Internals: Renaming + added ImStrSkipBlank() from docking branch. (cherry picked from commit a573943fa0ce323ffb4080e57f5e8fe1bc777c36)	2019-11-06 23:37:35 +01:00
omar	09b2310237	Internals: Added index of helpers and shuffled a few things.	2019-11-06 20:37:47 +01:00
omar	4c13807b7d	Misc: Optimized storage of window settings data (reducing allocation count).	2019-11-05 22:43:53 +01:00
omar	a704614b3e	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2019-11-04 16:33:57 +01:00
omar	8fee5a4349	Internals: Renaming for consistency.	2019-10-31 11:15:40 +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
Rokas Kupstys	c863c1f6a1	Clean up number rounding. Now it is more obvious what code is doing. (#2862 ) Add IM_ROUND() macro Replace IM_FLOOR(n + 0.5f) and ImFloor(n + 0.5f) with IM_ROUND(n)	2019-10-29 17:05:25 +01:00
omar	32380a0112	Viewport: Store current dpi scale in context.	2019-10-29 16:43:11 +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	ec0e953cca	Fixed a couple of subtle bounding box vertical positioning issues relating to text baseline alignment. The issue would generally manifest when laying out multiple items on a same line, with varying heights and text baseline offsets. (#2833) Some specific examples, e.g. a button with regular frame padding followed by another item with a multi-line label and no frame padding, such as: multi-line text, small button, tree node item, etc. The second item was correctly offset to match text baseline, and would interact/display correctly,but it wouldn't push the contents area boundary low enough. Note: previously the second parameter to ItemSize() was 0.0f was default, now -1.0f to signify "no text baseline offset request". If you have code using ItemSize() with an hardcoded zero you may need to change it. (+1 squashed commits)	2019-10-23 18:05:44 +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
Rokas Kupstys	714fe29d1a	Replace manual flooring with IM_FLOOR() macro. (#2850 ) Macro is used to ensure that flooring operation is always inlined even in debug builds. __forceinline does not force inlining in /Od builds with MSVC. (cherry picked from commit bc165df6fd7969605bbc07b8a6d3d28f9109e8f3)	2019-10-18 16:18:38 +02:00
omar	a41f0b2df4	Inputs: Fixed a miscalculation in the keyboard/mouse "typematic" repeat delay/rate calculation, used by keys and e.g. repeating mouse buttons as well as the GetKeyPressedAmount() function. IMPORTANT: Renamed internal CalcTypematicPressedRepeatAmount to CalcTypematicRepeatAmount and reordered the t1, t0 arguments to t0, t1 !! If you were using a non-default value for io.KeyRepeatRate (previous default was 0.250), you can add +io.KeyRepeatDelay to it to compensate for the fix. The function was triggering on: 0.0 and (delay+rate*N) where (N>=1). Fixed formula responds to (N>=0). Effectively it made io.KeyRepeatRate behave like it was set to (io.KeyRepeatRate + io.KeyRepeatDelay). Fixed the code and altered default io.KeyRepeatRate,Delay from 0.250,0.050 to 0.300,0.050 to compensate. If you never altered io.KeyRepeatRate nor used GetKeyPressedAmount() this won't affect you.	2019-10-14 23:07:06 +02:00
omar	c7bdec7e18	InputText, Nav: Fixed Left!Right keys broken when activating Keyboard Navigation. (#787 ) Amend `892dfb1`	2019-10-14 22:43:04 +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	e0c0e53edf	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-10-04 19:22:42 +02:00
omar	a6c3be4bda	Internals: Tweaks to ItemSize() should be harmless. Added DebugDrawItemRect() helper.	2019-10-03 18:30:41 +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	ca858c084b	Demo tweaks. Comments. Compacting the rarely used AutoFitXXX fields in ImGuiWindowTempData.	2019-09-23 20:15:25 +02:00
omar	52deb415e0	Internal: Refactored internal RenderMouseCursor so colors can be specified. (#2614 )	2019-09-23 14:53:49 +02:00
omar	25849234f6	Internal: Tree: tweaks (initially tried to implement auto-scrolling, stashed)	2019-09-23 13:11:38 +02:00
omar	3233d85d2f	Merge branch 'master' into docking	2019-09-22 22:16:11 +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	13f00331da	Docking: Added ImGuiDockNodeFlags_NoDocking flag. (#2109 )	2019-09-21 14:50:02 +02:00
omar	38d22bc47d	ColorPicker / ColorEdit: restore Hue when zeroing Saturation. (#2722 , #2770 ) - changelog, fixed uninitialized variables, tweaks, renaming.	2019-09-20 15:31:39 +02:00
Rokas Kupstys	accb0261b8	ColorPicker / ColorEdit: restore Hue when zeroing Saturation. (#2722 , #2770 ) Issue is fixed by storing last active color picker color and last hue value when active color picker takes rgb as input. Then if current color picker color matches last active color - hue value will be restored. IDs are not used because ColorEdit4() and ColorWidget4() may call each other in hard-to-predict ways and they both push their own IDs on to the stack. We need hue restoration to happen in entire stack of these widgets if topmost widget used hue restoration. Since these widgets operate on exact same color value - color was chosen as a factor deciding which widgets should restore hue.	2019-09-20 15:31:15 +02:00
omar	74e01e62ce	Fixed unused static function warning for some compilers. (#2793 )	2019-09-18 13:21:12 +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	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
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	b05f6f6f50	Nav, Scrolling: Added support for Home/End key. (#787 )	2019-09-16 19:01:40 +02:00
omar	c077dd4872	Fixed missing IMGUI_API for IsMouseDragPastThreshold().	2019-08-31 19:59:51 +02:00
omar	0bdc145343	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-31 19:19:00 +02:00
omar	d049a7988c	Docking: comments for DockBuilder API.	2019-08-31 16:51:12 +02:00
omar	3f99890f40	TabBar: feed desired width (sum of unclipped tabs width) into layout system to allow for auto-resize. (#2768 ) Before 1.71 tab bars fed the sum of current width which created feedback loops in certain situations. Amend `f95c77eeea`.	2019-08-29 14:57:34 +02:00
omar	9e294be5c5	Docking: Fix for node created at the same time as windows that are still resizing (typically with io.ConfigDockingAlwaysTabBar) to not be zero/min sized. (#2109 ) The fix delay their visibility by one frame, which is not ideal but not very problematic as the .ini data gets populated after that	2019-08-29 10:45:33 +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	483534b525	Internals: Using simpler ImVec2ih construct + fixed misnamed member.	2019-08-23 12:31:14 +02:00
omar	e1fca8d982	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-23 12:21:49 +02:00
omar	cb538fadfe	Internals: Storing settings using ImVec2ih to match what we are doing with dock node. + removed ImMax from reading Size value (done in Begin) + removed seemingly unnecessary FLT_MAX compare in SettingsHandlerWindow_WriteAll. About: Added backquote to text copied into clipboard so it doesn't mess up with github formatting when pasted.	2019-08-23 12:02:52 +02:00
omar	27431dcc6b	Docking: fix BeginDocked() path that creates node so that SetNextWindowDockID() doesn't immediately discard the node..(#2109 ) Amend `515ecbddc2`, not sure at this point if the (auto_dock_node) flag was needed at all. Comments. Exposed DockContextGenNodeID() in imgui_internal.h	2019-08-22 13:51:16 +02:00
omar	72090b646f	Fixed incorrect assignment of IsFallbackWindow which would tag dock node host windows created in NewFrame() as such, messing with popup viewport inheritance.	2019-08-22 11:35:17 +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	5d87ee8d82	Internals: Added function index for Viewport and Docking. Renamed a few functions.	2019-08-16 15:29:58 +02:00
omar	f624455d7b	Version 1.73 WIP	2019-08-01 10:57:13 -07:00
omar	967073ba3d	Viewport: Handle case where host window gets moved and resized simultaneous (toggling maximized state). There's no perfect solution there, than using io.ConfigViewportsNoAutoMerge = false. (#1542 )	2019-07-31 20:08:06 -07:00
omar	9bd7846f07	Internal: Made ScrollToBringRectIntoView() handle recursing back to scroll parent window, so the function can be called elsewhere (instead of 1 deep recursion done in NavUpdateMoveResult().	2019-07-31 18:37:55 -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	27079e68c2	Nav: Made hovering non-MenuItem Selectable not re-assign the source item for keyboard navigation.	2019-07-31 14:31:06 -07:00
omar	4cfaf7d89c	Scrolling, Nav: Fixed programmatic scroll leading to a slightly incorrect scroll offset when the window has decorations or a menu-bar (broken in 1.71). This was mostly noticeable when a keyboard/gamepad movement led to scrolling the view, or using e.g. SetScrollHereY() function. Fix/amend `a0994d74`.	2019-07-31 14:31:06 -07:00
omar	3548fb8013	Internal refactor: moved all Scroll related functions in a same spot.	2019-07-30 20:04:02 -07:00
omar	1b1e539288	Internal: Moved NavScrollToBringItemIntoView() declaration to imgui_internal.h. Fixed spacing missing in `494d804`. Fixed changelog wreck from 1.72.	2019-07-30 18:21:44 -07:00
omar	494d804735	Internal: Added ImGuiInputTextState::ClearText() helper.	2019-07-30 15:02:40 -07:00
omar	cb2de62bb1	Docking: Renaming, comments.	2019-07-29 15:56:59 -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	7a26a49f08	Internal: Added IsMouseDragPastThreshold(). Tweaks. Todo. Demo: Showing how to use the format parameter of Slider/Drag functions to display the name of an enum value instead of the underlying integer value	2019-07-26 17:19:01 -07:00
omar	824e8c53b4	Internals: Added IMGUI_DEBUG_INI_SETTINGS. Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.	2019-07-23 21:37:09 -07:00
omar	969278fc0b	Docking: Fixed dragging/resizing from OS decoration not marking settings as dirty. Internals: Added IMGUI_DEBUG_LOG_DOCKING, IMGUI_DEBUG_LOG_VIEWPORT macros to easily enable/disable a bunch of logging code.	2019-07-23 21:29:43 -07:00
omar	efc4c0fe9d	Internals: Made IMGUI_DEBUG_LOG redefinable in imconfig.h. Comments. Fix to allow Metrics's NodeWindow() being called with a NULL window.	2019-07-23 21:26:15 -07:00
omar	db2581bee9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-07-23 13:35:01 -07:00
omar	baae057a03	Internals: Merge in minor noise from wip Tables branch to simplify further merging.	2019-07-23 13:28:36 -07:00
omar	26f14e056c	Scrolling: Made mouse-wheel scrolling lock the underlying window until the mouse is moved again or until a short delay expires (2 seconds). This allow uninterrupted scroll even if child windows are passing under the mouse cursor. (#2604 )	2019-07-22 18:49:52 -07:00
omar	dcd03f62a7	Scrolling: Made it possible for mouse wheel and navigation-triggered scrolling to override a call to SetScrollX()/SetScrollY(), making it possible to use a simpler stateless pattern for auto-scrolling. Demo: Log, Console: Using a simpler stateless pattern for auto-scrolling.	2019-07-22 18:49:51 -07:00
omar	75136d3bea	Internals: Removed ShowDockingDemo(), moved into Metrics. Metrics: Added more links to browse window->node, node->window, node->node etc.	2019-07-22 11:51:04 -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	9f35ba8546	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-07-19 15:19:10 -07:00
ocornut	047dc16af5	Debug Tools: Added DebugStartItemPicker() in imgui_internal.h to facilitate binding this anywhere in user's tool. Adedd highlight. Added IMGUI_DEBUG_TOOL_ITEM_PICKER_EX to break in ItemAdd().	2019-07-19 11:28:03 -07:00
omar	7fd34d4f30	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-07-17 18:48:16 -07:00
omar	1f3feb481e	Internals: Refactor: Moved all Columns code from imgui.cpp to imgui_widgets.cpp (#125 ) Also moved NextColumn between BeginColumn and NextColumn which makes it easier to work on that code.	2019-07-17 17:10:27 -07:00
omar	bb2aa5e770	Docking: Making it possible to undock a node by clicking on the tab bar / title bar for the node. (#2645 , #2109 )	2019-07-17 13:55:00 -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	130b44994e	Debug, Metrics: Added "Tools->Item Picker" tool which allow clicking on a widget to break in the debugger within the item code. The tool calls IM_DEBUG_BREAK() which can be redefined in imconfig.h if needed.	2019-07-16 18:25:49 -07:00
omar	718e15c7de	Docking: Fix so that an appearing window making a dock node reappear won't have a zero-size on its first frame (because dock node ->Size was 0.0 unlike ->SizeRef) (#2109 ) Docking: Added ImGuiDockNode to .natvis file.	2019-07-16 11:45:52 -07:00
omar	e461e7bc7a	Moved ImGuiColumnsFlags erroneously forward declared in imgui.h + demo bit.	2019-07-14 12:29:23 -07:00
omar	1f54c16f52	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-02 18:47:10 +02:00
omar	2a3517a399	Internals: Checkbox: Added undocumented mixed/indeterminate/tristate support via ImGuiItemFlags_MixedValue. (#2644 )	2019-06-30 12:03:09 +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	e2c1f0a7cd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-06-18 23:12:50 +02:00
omar	ae2c9f7101	Internals: Columns: Poke into WorkRect and use them in the GetContentRegionMax() functions. This should be a no-op, but preparing us to transition toward using WorkRect instead of ContentRegionRect. Removed one use of ContentsRegionRect.	2019-06-17 12:14:34 +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	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	a8eb64fc54	Log/Capture: Fixed BeginTabItem() label not being included in a text log/capture. Extracted tab rendering code into a RenderTextEllipsis() function.	2019-06-11 14:03:13 +02:00
omar	afa3978ff6	Internals: Added drawlist and color arg to RenderArrow(), RenderBullet(). Reordered args for RenderPixelEllipsis.	2019-06-07 17:32:51 +02:00
omar	32ab0a82d6	imgui-test: Added IMGUI_TEST_ENGINE_LOG macro to emit into test log from core or user land.	2019-06-07 13:46:54 +02:00
omar	2b997141cf	Made PushID() behave the same in 32-bit and 64-bit, by not padding the integer into a void*. (Also technically faster.)	2019-06-06 16:36:26 +02:00
omar	431aa4e456	Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.	2019-06-06 16:13:30 +02:00
omar	e6850891cc	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-06-05 16:09:06 +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	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	440ad0b440	Merge branch 'master' into docking	2019-06-05 00:37:20 +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	84f3ecc231	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-05-30 18:52:24 +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	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	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	70d9f79312	Internal: Renamed InnerMainRect to InnerVisibleRect. Printing coordinates in Metrics window.	2019-05-28 11:23:04 +02:00
omar	5b0e59d9d5	Docking: Saving local _NoResize flag. (#2583 )	2019-05-27 22:11:21 +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	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	6c3697f6f1	Internal: CloseButton takes an upper-left corner + a size to be consistent with similar widgets.	2019-05-24 17:58:21 +02:00
omar	ec3ec24157	Internals: Extracted some of the tab bar shrinking code into a ShrinkWidths() function so columns/table can use it.	2019-05-24 14:32:33 +02:00
omar	fda1365c15	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-05-23 00:04:25 +02:00
omar	7bc03f7155	Internals: Added InnerWorkRect equal to old InnerClipRect, added InnerWorkRectClipped actually clipped.	2019-05-22 23:56:31 +02:00
omar	a2eec8f5b5	Fix OuterRectClipped not being clipped correctly, which resulted in child window outside visible bound to not be marked with SkipItems. Broken in `b50c61c961`. + Comments on InnerClipRect being misleading. Demo: Tweak to sizing of child window in the Layout->Scrolling section.	2019-05-22 22:14:31 +02:00
omar	04022114d9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-05-21 14:47:29 +02:00
omar	f242cd4d8a	Fixed GCC mem-access warnings (#2565 ) + using "if defined" more consistently for Clang.	2019-05-19 17:15:14 +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	fc3c3de551	Fixed uses of IsItemDeactivated(), IsItemDeactivatedAfterEdit() on multi-components widgets and after EndGroup(). (#2550 , #1875 )	2019-05-13 19:05:41 +02:00
omar	99a845053a	Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)	2019-05-13 18:26:28 +02:00
omar	64dbd932d2	Internal: Removed GetNextItemWidth(), relying on ItemAdd or NextItemData.ClearFlags() to clear the width data. Amend `5078fa20` and undo some of its effects of imgui_widgets.cpp	2019-05-13 15:29:00 +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	36e714a459	Internal: Storing flags for NextWindowData so that we can clear everything with a single write and remove dummy condition fields.	2019-05-13 14:57:30 +02:00
omar	0b485f12d7	Internal: Minor tidying/reordering of sections within ImGuiContext / window DC.	2019-05-13 14:02:03 +02:00
omar	835a8b2c9b	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-05-10 22:56:43 +02:00
omar	37174c85e2	Internal: Scrollbar: Extracted scrollbar code for other uses (eg. table v2 scrolling without using a child window).	2019-05-10 18:52:23 +02:00
omar	e29176df53	Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.	2019-05-09 13:12:09 +02:00
omar	a4d0b0efa4	Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759 ) + misc comments	2019-05-09 12:55:01 +02:00
omar	b7c2759f95	Columns: Fixed Separator from creating an extraneous draw command. Fixed Selectable with SpanAllColumns flag from creating an extraneous draw command. (#125 )	2019-05-09 12:10:36 +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	86f92fe756	Demo: Improved trees in columns demo. (#2136 )	2019-05-02 21:32:36 +02:00
omar	ce19cb465f	Internals: Rename GetContentRegionMaxScreen() -> GetWorkRectMax(). At this point this is mostly useful to facilitate merge of other branches.	2019-05-02 16:29:40 +02:00
omar	7e67aba286	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-04-29 13:06:55 +02:00
omar	842a720e72	Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's `ae76a1fd`).	2019-04-28 22:33:58 +02:00
omar	bda2cde68e	Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517 ) Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.	2019-04-28 22:18:51 +02:00
omar	3276b12765	Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h	2019-04-28 20:55:51 +02:00
omar	4e81b2d093	Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.	2019-04-28 17:15:08 +02:00
omar	3d363c91fd	Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.	2019-04-28 15:27:18 +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	0ca1675ff9	Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.	2019-04-25 16:03:47 +02:00
omar	59a3f0476d	Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.	2019-04-25 15:21:22 +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	03b64defa5	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-04-19 19:52:45 +02:00
omar	59f012d656	Internals: ImHashStr() default parameter.	2019-04-19 19:48:51 +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	9d4a893a77	Internals: Moved CalcItemSize next to CalcItemWidth, added comments to clarify their respective intent. Should have no side effect.	2019-04-18 15:46:12 +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	655ebe4eaf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-04-16 13:14:10 +02:00
omar	742b5f4c68	Merged a bunch of small changes from Docking branch to reduce the difference between branches. Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.	2019-04-16 13:07:43 +02:00
omar	311469e9d6	Internals: Columns: Some renaming, extracted code into GetColumnsID().	2019-04-16 11:58:54 +02:00
omar	f70eacee8e	Docking: Internal: Added helper for automation to process docking at the mouse level.	2019-04-13 19:50:30 +02:00
omar	712203dbcb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-04-13 18:53:00 +02:00
omar	224f087a5f	Docking: Rename typo Autority -> Authority + Rename DockContextNewFrameUpdateDocking -> DockContextUpdateDocking.	2019-04-13 00:36:24 +02:00
omar	fb2626c21b	Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.	2019-04-13 00:29:27 +02:00
omar	092426bed2	Docking: Hold Shift to force disable docking. (#2109 )	2019-04-13 00:27:44 +02:00
omar	c6f1b7b92a	Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.	2019-04-13 00:27:44 +02:00
omar	ee02cdbf03	Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)	2019-04-12 17:49:40 +02:00
omar	328e4fa7e7	Merge branch 'master' into docking # Conflicts: # imgui_demo.cpp	2019-04-11 15:53:38 +02:00
omar	07a70dc972	Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.	2019-04-11 15:40:36 +02:00
omar	cf029b3e1c	Merge branch 'master' into docking	2019-04-08 18:05:52 +02:00
omar	1391904fd2	Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684 , #2341 )	2019-04-08 17:59:25 +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	8dab7ac021	InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467 , #1336 )	2019-04-03 11:14:34 +02:00
omar	9bf6509c6e	Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109 ) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304 )	2019-03-28 18:43:27 +01:00
omar	5af385ea78	Viewport: Renamed member + added note about a Docking issue with restoring focus.	2019-03-28 18:02:03 +01:00
omar	b6ae8a0dca	Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453 , #2109 )	2019-03-28 16:11:50 +01:00
omar	a33d45d7cd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-03-28 15:48:25 +01:00
omar	9a0e71a6ec	Internals: Renamed the ImGuiWindow HiddenFrameXXX fields to decorrelate them from resizing behavior, as those values are set by other logic.	2019-03-28 15:41:49 +01:00
omar	5a665e423c	Docking: Added ImGuiDockNodeFlags_NoTabBar (not exposed publicly). (#2423 , #2109 )	2019-03-27 20:44:49 +01:00
omar	fc95da8aa3	Docking: Internals: Moved CentralNode and HiddenTabBar state into LocalFlags for consistency. (#2423 , #2109 )	2019-03-27 20:32:44 +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	8d4b5fef1d	Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. (#2109 )	2019-03-27 17:36:52 +01:00
omar	04a9ce3a18	Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109 )	2019-03-27 16:16:31 +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	221bf93a55	Comments, todo list, remove trailing spaces.	2019-03-17 00:56:21 +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	53e0c13be2	TabBar: Reworked scrolling policy (when ImGuiTabBarFlags_FittingPolicyScroll is set) to teleport the view when aiming at a tab far away the visible section, and otherwise accelerate the scrolling speed to cap the scrolling time to 0.3 seconds.	2019-03-12 20:57:02 +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	65c2220049	Internal: Removed unused fields from ImGuiMenuColumns.	2019-03-11 20:14:56 +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	ecf7666624	Docking: Fixed an issue where removing the last window from a dockspace node that is not a central node without remove the node. (#2414 , #2109 )	2019-03-10 22:19:18 +01:00
Bruce Mitchener	b5d57a6615	Fix typos. (#2413 )	2019-03-09 10:10:17 +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
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
omar	e02d6014bf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-03-05 22:13:38 +01:00
omar	26328fc9fe	Internal: Tabbing/Focus: Tidying up old code, moved some state to context instead of window. Storing new data will allow us to fix the bug mentioned in #2215 (probably in next commit).	2019-03-05 19:51:27 +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	1ed3c4cf4a	Internal: Text: Extracted TextUnformatted into TextEx over which we can freely atter the signature. Clarified current large text behavior of TextUnformatted with explicit ImGuiTextFlags_NoWidthForLargeClippedText flag (always set).	2019-03-05 17:35:45 +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	f02705fbaa	InputInt, InputScalar: +/- buttons now respects the natural type limits instead of overflowing or underflowing the value.	2019-02-27 18:59:17 +01:00
omar	6b43a314bf	Merge branch 'master' into docking	2019-02-26 12:53:38 +01:00
omar	cf3cb7cf7e	InputText: Fixed various display corruption related to swapping the underlying buffer while a input widget is active (both for writable and read-only paths). Often they would manifest when manipulating the scrollbar of a multi-line input text.	2019-02-26 12:50:44 +01:00
omar	b7b82520b4	Internal: InputText: Minor changes (intended to have side-effect but clarify next commit, however there is rarely such a thing as zero side effect in InputText land!)	2019-02-26 12:28:27 +01:00
omar	8915f7933a	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-02-24 23:24:07 +01:00
omar	6cbf4b8121	Fixed uninitialized variable (leading to asserts in the docking branch). (#2376 , #2371 )	2019-02-23 17:00:59 +01:00
omar	9558e327d2	Log/Capture: Fixed extraneous leading carriage return. Fixed an issue when empty string on a new line would not emit a carriage return.	2019-02-23 16:22:55 +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	2cd7de5666	Internal: Log/Capture: Rework to add an internal LogToBuffer() function which is useful for writing automated tests. Clarified logging state by adding an enum.	2019-02-23 15:57:06 +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	0f83145aa8	TabBar: Fixed a crash when using BeginTabBar() recursively (didn't affect docking). (#2371 ) Added ImPool::Contains() helper.	2019-02-22 12:24:27 +01:00
omar	332f8f2462	Internal: InputText: Made clipboard copy/cut use its own temporary buffer (like paste) so we can guarantee that TempBuffer if not altered and can be preserved. Renamed TempBufferA to TextA to celebrate this.	2019-02-21 19:55:37 +01:00
omar	81a8730022	Internal: InputText: Renamed is_editable to !is_readonly, Hopefully more explicit. Renamed internal member. Shuffled some code. Added comments, assert (_will_ trigger on !readonly > readonly edge, old bug).	2019-02-21 19:55:36 +01:00
omar	677e64e71e	Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.	2019-02-20 21:34:08 +01:00
omar	257f5d204e	Version 1.69 WIP	2019-02-20 00:11:36 +01:00
omar	93b06e6e7c	Internal: Changed Scrollbar() signature. Using GetScrollbarID() in InputTextMultiline(). Removed multiple semi-colons (#2368)	2019-02-20 00:08:21 +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	09c9bf2edb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +01:00
omar	93d1179805	Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency. Added more link to nothing's oversample document. Spacing bits.	2019-02-14 19:29:09 +01:00
omar	0236bc246f	Scrollbar: Fade out and disable interaction when too small, in order to facilitate using the resize grab on very small window, as well as reducing visual noise/overlap. (+1 squashed commits) Internals: Added GetScrollbarID(). (#1185)	2019-02-14 14:07:59 +01:00
omar	4a3a895be9	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	f366828dd2	Minor tweaks to reduce false positive of PVS Studio static analyzer.	2019-02-06 13:16:52 +01:00
omar	97ed97b8ce	Plot: Register an ID to take the click the same way as other framed widgets. Set HoveredId in the FramePadding zone (between inner_bb and frame_bb).	2019-02-05 21:17:04 +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	7227454dca	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h	2019-02-03 17:31:16 +01:00
omar	c23a19c26f	Internals: Exposed internal SetWindowPos to imgui_internal.h (for imgui-test)	2019-02-03 17:29:51 +01:00
omar	d1c45c0d76	Merge branch 'master' into docking (enable range_select merge) # Conflicts: # imgui.cpp # imgui_internal.h	2019-02-01 12:25:49 +01:00
omar	5cb7040f66	Internals: Tracking dummy select scope id (currently always zero) to facilitate merging of the range_select branch. (#1861 )	2019-02-01 12:14:38 +01:00
omar	0d4a2a2cd0	Internals: Track ActiveIdHasBeenPressed (similar to ActiveIdHasBeenEdited). This is currently mostly for the benefit of the range_select branch. (#1861 )	2019-02-01 12:14:37 +01:00
omar	e30babef09	Fixed Clang/Win32 warning.	2019-02-01 11:22:53 +01:00
omar	cbf24a9151	Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.	2019-02-01 11:04:04 +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	f906d53f7d	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-31 19:19:35 +01:00
omar	1f2bdd37b3	Docking: Builder: Added DockBuilderSetNodePos, DockBuilderSetNodeSize, allow DockBuilderAddNode creating floating node (dockspace requires ImGuiDockNodeFlags_Dockspace) (#2109 )	2019-01-31 17:01:15 +01:00
omar	5536edede9	Docking: Fixed faulty undocking of windows with the _NoMove flag. (#2325 , #2109 ) Whereas BeginAsDockableDragDropTarget could be reworked to filter, we simply set g.HoveredWindowUnderMovingWindow to be NULL when MovingWindow is not set, which was the initial intent. Also fixed some comments and removed unused braces in TabItemEx().	2019-01-31 14:59:45 +01:00
omar	578e15f006	Docking: Removed unnecessary ImGuiTabItemFlags_DockedWindow internal flag.	2019-01-31 14:55:00 +01:00
omar	fb4f1ff7f6	InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. (#2321 , #787 )	2019-01-30 15:16:09 +01:00
omar	0a233a505d	imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.	2019-01-30 12:53:01 +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	c3c2cd1e82	Fix various XCode and PVS-Studio static analyzer warnings (#2309 )	2019-01-27 16:18:23 +01:00
omar	07ff47bf1b	Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. (#2109 )	2019-01-23 19:54:45 +01:00
omar	9f96fcff3c	Docking: Added ImGuiDockNodeFlags_Dockspace instead of node internal IsDockspace toward allowing the DockBuilder API to create non-dockspace nodes.	2019-01-23 19:24:34 +01:00
omar	c81a5a6070	Docking: Comments and renaming locals to facilitate debugging.	2019-01-22 12:38:10 +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	f14f93ef6e	Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.	2019-01-21 16:50:27 +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	d1851ed6b7	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]	2019-01-16 16:19:38 +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	95ee99e6aa	Version 1.68 WIP	2019-01-15 20:19:05 +01:00
omar	515ad62335	Merge branch 'viewport' into docking # Conflicts: # docs/TODO.txt	2019-01-15 15:14:16 +01:00
omar	73353fad64	Merge branch 'master' into viewport	2019-01-15 15:13:29 +01:00
omar	d38d7c6628	TODO update + internals: changed order or ImGuiLayoutType enums to allow using them for indexing.	2019-01-15 15:06:24 +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	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	e3ccc96789	Internals: Added ImBoolVector 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	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	81eaa49773	Internals: Added comment index in imgui_internal.h	2019-01-10 15:51:08 +01:00
omar	f53cd3ee0f	Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase. Demo: Typo. C98 fix.	2019-01-08 17:37:07 +01:00
omar	b33977bc15	Tests: Reworking hook prototypes for imgui-test to be faster and multi-context friendly.	2019-01-07 23:59:05 +01:00
omar	c2db7f63bd	Selectable() should have an ID even though they are disabled, to be consistent with other widgets. Not sure of the reasoning ~1.41 which made this turn to 0.	2019-01-07 23:48:50 +01:00
omar	3997e8b555	Fixed animated window titles from being updated when displayed in the CTRL+Tab list. + Adding overkill helpers for reusing buffers. (#787 )	2019-01-07 22:46:42 +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	acfa4050ec	Tweak changelog + tweak internal render helper functions.	2019-01-07 16:43:55 +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	5278da98d2	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_demo.cpp	2019-01-03 21:40:08 +01:00
omar	606175b98f	Viewport: Fix for minimization of individual viewports (the current back-end forcing a parent/child relationship between secondary viewports and the main viewport have hidden this issue). Follows `d8ab2c1ac`.	2019-01-03 21:27:47 +01:00
omar	b26f16a27f	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2019-01-02 23:16:10 +01:00
omar	a0c2e55e8c	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2019-01-02 23:11:52 +01:00
omar	237109caa5	Internals: Extracted code out of EndFrame() into UpdateMouseMovingWindowEndFrame()	2019-01-02 23:08:32 +01:00
omar	b3469fa94b	Alternative fix for bug introduced in `d845135` (#1651 ), fix CTRL+Tab and fallback tooltip.	2019-01-02 23:08:32 +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	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	e194219f2e	Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109 )	2019-01-02 16:22:44 +01:00
omar	a71d3c8cb3	Viewport: Misc comments following user feedbacks..	2018-12-21 18:40:16 +01:00
omar	81a2546cea	Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_win32_directx9/main.cpp	2018-12-20 23:06:29 +01:00
omar	d9fda22763	Viewport: Fixed not clearing request flags in main viewport, which led some back-end (SDL) to break on resize as PlatformRequestResize would stay true forever and inhibit new sizes passed to AddUpdateViewport(). (#1542 )	2018-12-20 22:33:51 +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	ae76a1fda7	Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.	2018-12-18 15:01:15 +01:00
omar	ac9512e095	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2018-12-14 18:46:24 +01:00
omar	65dac02171	Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.	2018-12-14 18:44:17 +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	587506dd57	Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)	2018-12-14 11:27:02 +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	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	d20e3ee710	Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.	2018-12-10 14:30:41 +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	125e62491e	Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.	2018-12-04 14:34:49 +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	8bac6d428d	Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. (#2109 )	2018-12-04 00:01:20 +01:00
omar	f6b6ad1959	Viewport: Minor tweaks, better struct layout.	2018-12-03 20:30:00 +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	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	f663277591	Merge misc/shallow changes from Docking branch to minimize drift: moved some blocks, added comments.	2018-11-30 14:35:13 +01:00
omar	baf67d393f	When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. (#2213 )	2018-11-29 23:25:29 +01:00
omar	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	36cbe1e521	Viewport: Misc renaming.	2018-11-29 21:21:04 +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	c08b4b46f4	Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196 )	2018-11-27 19:46:36 +01:00
omar	4575354bc0	Docking: Comments + maiintain LastFrameFocused per node + using bitfiield for docking bools.	2018-11-27 13:29:09 +01:00
omar	3f51c831de	Docking: Added internal DockBuilderGetCentralNode(). Fixed being unable to undock whole node from dock button in DockSpace with a central node. (#2109 )	2018-11-26 22:18:55 +01:00
omar	4a8efd7e68	Docking: Hidden tab-bar triangle reflects focus but using Button colors. (#2109 )	2018-11-26 17:57:01 +01:00
omar	d23c69d319	Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. (#2109 )	2018-11-26 17:25:06 +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	d8ab2c1ac9	Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542 ) + todo	2018-11-23 16:55:33 +01:00
omar	862781b195	Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205 ) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)	2018-11-23 16:35:17 +01:00
omar	cae4d020dc	Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542 )	2018-11-22 21:18:14 +01:00
omar	760c1d95b9	Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542 )	2018-11-22 21:13:07 +01:00
omar	0c4dee083c	Internals: Added ImPool helper data structure (used by testing system, and already in docking branch)	2018-11-22 18:59:57 +01:00
omar	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	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	6b4443755d	Internals: Added FindWindowByID() helper. (#2190 )	2018-11-15 16:41:48 +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	aa668c410a	Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. (#2168 ) + adding a else block to make NavCalcPreferredRefPos() more explicit.	2018-11-15 13:56:27 +01:00
omar	6c1ae6cc71	Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).	2018-11-09 14:41:40 +01:00
omar	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
omar	ac9aaf4b6e	Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.	2018-10-25 17:45:48 +02:00
omar	5f8c9ae0ef	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:57:54 +02:00
omar	69db792bf0	Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. (#1542 , #1660 , #1878 , etc.)	2018-10-15 17:38:36 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	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	ed4dcd9072	Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()	2018-10-11 22:38:26 +02:00
omar	cf0afb48ac	TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments. Internals: Added ImStreolRange() + used in LogRenderedText() + comments.	2018-10-11 12:53:10 +02:00
omar	1efafa1d29	Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)	2018-10-10 12:09:06 +02:00
omar	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	cb76c086e0	Docking: Removed context parameter from internal DockBuilderXXX api at it is expected we transition it to be public facing. (#2109 )	2018-10-05 16:14:51 +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	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	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	46dff42239	Docking: Fixed dock node with single window accidental stealing of non-owned host viewport (leading to general havoc).	2018-09-30 19:30:51 +02:00
omar	876a3299fc	Docking: Added DockBuilderCopyDockspace() wip. Added DockBuilderCopyWindowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().	2018-09-28 17:58:55 +02:00
omar	93896d550e	Added FindOrCreateWindowSettings() internal helper.	2018-09-26 23:01:51 +02:00
omar	c0a89f8f4e	ImPool: Added Reserve() helper function.	2018-09-26 21:51:30 +02:00
omar	4053d9d638	Docking: Fixed tab order restoring (follow up to `67be485e`, broken in `455dc6e2`)	2018-09-26 17:11:37 +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	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	85e1e2b0c8	Docking: Added DockBuilderGetNode() wrapper for consistency.	2018-09-25 14:14:07 +02:00
omar	9960ccddb2	Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.	2018-09-24 23:19:18 +02:00
omar	4021776d0f	Docking: Fix for undocking node where the dockspace node is attached to an immovable parent window. + Tweak .ini output.	2018-09-24 22:14:12 +02:00
omar	fa0ce4b7d5	Docking: Some DockBuilder functions are applied on settings data if windows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)	2018-09-24 16:38:44 +02:00
omar	2a5ce1849a	Docking, Viewport: Reworked viewport inheritance/transition so that extracting a dock node from a split node owning its viewport will have both viewports be in the expected OS z-order. (The lower window re-use the exiting viewport, the detached node uses a new viewport:	2018-09-24 10:53:51 +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	e647f89c33	Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!	2018-09-19 22:38:40 +02:00
omar	95d49c3b98	Docking: Internals renaming LastExplicitSize to SizeRef (invalidate .ini data) + todo	2018-09-19 18:25:26 +02:00
omar	291bfe6841	Docking: work to allow programmatic control of dock nodes, various refactor + assert fix. Probably broke something (but I haven't found what yet!)	2018-09-19 16:00:13 +02:00
omar	35032d41fa	Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext	2018-09-17 17:06:52 +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	175bab4f5f	Docking: Removed SplitRatio from ImGuiDockNode and ImGuiDockNodeSettings, which we don't need anymore.	2018-09-14 17:51:30 +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	1cefc48f13	Docking: Internal renaming and comments. + Fixed DockNodeMoveChildNodes() to transfer the LastExplicitSize value (was inconsequential afaik).	2018-09-11 18:53:08 +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	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	d5692bff00	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:30:14 +02:00
omar	dcef0c0237	Docking: Updating LastFrameActive earlier in Begin() because BeginDocked() will need to use it. Extracted some code into a DockNodeIsDropAllowedOne() function. Comments.	2018-09-10 20:23:03 +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	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	c039a77d21	Internals: Added ImPool helper structure. Moved ImVec1f.	2018-09-06 21:45:10 +02:00
omar	52e0de84a9	Internals: Split RenderTextClipped into two functions.	2018-09-06 21:45:09 +02:00

... 7 8 9 10 11 ...

1591 Commits