imgui

mirror of https://github.com/ocornut/imgui.git synced 2024-12-23 21:15:03 +01:00

Author	SHA1	Message	Date
ocornut	20a1edef89	Nav: made EndMenuBar() use NavMoveRequestForward() for consistency. Moved forward clearing to NavMoveRequestApplyResult(). Improved/fixed comments.	2021-08-27 17:21:10 +02:00
ocornut	780c1ee265	TextUnformatted: Accept null ranges including (NULL,NULL) without asserting. (#3615 )	2021-08-24 19:30:02 +02:00
ocornut	0608887fb5	InputTextMultiline: Fixed label size not being included into window contents rect unless the whole widget is clipped.	2021-08-23 17:07:46 +02:00
ocornut	0649f750b4	Version 1.85 WIP	2021-08-23 15:31:06 +02:00
ocornut	5a7d18a441	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2021-08-20 18:15:25 +02:00
ocornut	d2ffbd9b86	Version 1.84 Fix PVS Studio false positive //-V1020 Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path	2021-08-20 18:03:55 +02:00
ocornut	c543d93af1	Expose BeginDisabled()/EndDisabled() in public API. Add to demo. (#211 )	2021-08-20 16:34:43 +02:00
ocornut	0b06c4b2b0	Merge branch 'master' into docking (will need further for io.AddFocusEvent) # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp	2021-08-19 17:25:12 +02:00
ocornut	161b74e871	Fix tabbing in/out of an InputTextMultiline(), broken by `6b8a059`.	2021-08-17 20:46:39 +02:00
Oliver 'kfsone' Smith	7e9e1ff1c2	InputText: Fix named filtering flags disabling newline or tabs in multiline inputs (#4409 , #4410 )	2021-08-17 16:10:11 +02:00
ocornut	f9b5168fb3	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp	2021-08-02 16:00:50 +02:00
ocornut	e362c5af48	Internals: ColorEdit: renamed some internal masks to match our common coding style. ImGuiColorEditFlags__DisplayMask > ImGuiColorEditFlags_DisplayMask_, ImGuiColorEditFlags__OptionsDefault > ImGuiColorEditFlags_DefaultOptions_, ImGuiColorEditFlags__DataTypeMask > ImGuiColorEditFlags_DataTypeMask_ etc.	2021-07-26 20:44:59 +02:00
ocornut	7bfc379a23	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2021-07-19 21:58:06 +02:00
ocornut	90bf996e1a	Internals: widgets always read back from g.LastItemData.InFlags (so we can now modify per-item disable state more easily). (#211 )	2021-07-19 21:26:34 +02:00
ocornut	6b8a059fc9	Internals: moved LastItem data to a shared structure (instead of one per window) (should be a no-op as we are restoring things in Begin/End. Toward faciliate backup/restore of LastItemData and favor pulling from here instead of CurrentItemFlags, toward #211)	2021-07-19 21:25:47 +02:00
ocornut	1ad153056a	Internals: ItemAdd: set LastItemXXX fields before navigation calls + comments about io.IniFilename (#4294 )	2021-07-19 21:24:15 +02:00
ocornut	17ec4f1f6f	TestEngine, MenuItem: call IMGUI_TEST_ENGINE_ITEM_INFO() at the right stack level. (amend `f8fae02`)	2021-07-12 16:42:53 +02:00
ocornut	246ad6c03c	Disabled: items more consistently release active id if the active item got disabled. (#211 ) (amend `2952525`)	2021-07-12 15:39:47 +02:00
ocornut	a11f36811f	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h	2021-07-09 20:16:19 +02:00
Rokas Kupstys	5dd1e38b7a	Disabled: disabled items set HoveredId, allowing e.g. HoveredIdTimer to function. (#211 , #3419 ) + Menus: fix hovering a disabled menu or menu item not closing other menus. Rework of https://github.com/rokups/imgui/commit/c24b470 Note that the declared intent of that commit "Prevents window from being dragged if mouse hovers a disabled item." was already fullfilled by `a876ad87`. Changes in ButtonBehavior() not needed anymore since ImGuiButtonFlags_Disabled is gone	2021-07-09 19:54:46 +02:00
ocornut	cac869b333	Disabled: don't prevent Selectable() from being selected. (#211 ) + BeginMenu()/MenuItemEx() uses PushDisabled() the standard way. ImGuiSelectableFlags_Disabled is now unused by the library and might be marked obsolete later.	2021-07-09 19:54:43 +02:00
ocornut	29525255f3	Disabled items more consistently release active id if the active item got disabled. (#211 )	2021-07-09 19:54:41 +02:00
ocornut	ba1c8464ef	Internals: Removed ImGuiButtonFlags_Disabled (which had inconsistent behavior) in favor of ImGuiItemFlags_Disabled. Selectable()'s ImGuiSelectableFlags_Disabled now uses the later. (#211 )	2021-07-09 19:54:37 +02:00
ocornut	f6682404e1	InputInt/InputFloat: When used with Steps values and _ReadOnly flag, the step button look disabled. (#211 )	2021-07-09 19:54:34 +02:00
ocornut	97638bf977	BeginMenu: remove unnecessary call to ItemHoverable() which is already done by the Selectable() call. Amend `88d7b3de`	2021-07-09 18:57:28 +02:00
ocornut	4a100f7f11	Nav: Disabled items are not candidate for default focus. (#211 , #787 ) + simplify handling of ImGuiButtonFlags_PressedOnDragDropHold path.	2021-07-09 18:57:23 +02:00
ocornut	f8fae02270	Menus: rework to allow for an icon column (not yet exposed, but usable via internals) + fix menus being affected by style.SelectableTextAlign (#126 )	2021-07-08 15:05:02 +02:00
ocornut	696d3e056e	Internals: Menus: Naming offset field + fix spacing/offset computation to handle more offsets.	2021-07-07 20:47:37 +02:00
ocornut	3512f2c2c2	Internals: Menus: minor tidying up + renaming in ImGuiMenuColumns + removing extraneous offset field which is always zero + using smaller types. sizeof() 36 -> 20	2021-07-07 20:16:55 +02:00
ocornut	0f7eb00f67	Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys(). No need to clear fields before deletion. DX12: renamed to match docking branch.	2021-06-29 15:31:05 +02:00
ocornut	ac35b4bba2	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h # imgui_demo.cpp	2021-06-24 18:21:19 +02:00
ocornut	20d415e939	FIx static analysers warnings and disable false positives.	2021-06-24 17:15:14 +02:00
ocornut	1965f38e9e	ImGuiWindowFlags_UnsavedDocument/ImGuiTabItmeFlags_UnsavedDocument display a dot instead of a '*'.	2021-06-24 14:30:32 +02:00
ocornut	f0c4d609a6	Default window focus scope not 0. Added ImGuiSelectableFlags_SelectOnNav with comments and caveats. (#1861 , #4242,) Focus scope default value: amend `7ee623d9` `a5041c88` `2ebe08be`	2021-06-21 17:47:45 +02:00
ocornut	a15c42d5bd	Nav: moved RenderNavHighlight() calls of TreeNode and Selectable out of if (hovered \|\| selected) tests. Should make no difference as NavId currently returns hovered. (#1861 , #4242 )	2021-06-21 17:38:56 +02:00
Rokas Kupstys	d5828cd988	SplitterBehavior: fix using IsItemHovered() after SplitterBehavior()	2021-06-16 15:42:42 +02:00
ocornut	0cca0d1617	Internals/experimental: BeginComboPreview(), EndComboPreview(). (#4168 , #1658 ) (amended)	2021-06-15 15:27:28 +02:00
ocornut	db0338a1f2	Nav, Drag and Drop, Docking: fixed two issues leading nav result to conflict with moving a window. (#4211 , #3025 )	2021-06-09 19:20:13 +02:00
ocornut	16abfa5eb6	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2021-06-04 17:28:45 +02:00
ocornut	060b6ee7d1	Internals: Combo: Extracted into a BeginComboPopup() function. (#4168 ) Renamed frame_bb > bb locally.	2021-05-28 17:45:07 +02:00
ocornut	5b4bc985ad	Nav, Combo: removed unnecessary window->LastNavIds[] assignment in combo code. + minor renaming.	2021-05-28 17:27:52 +02:00
ocornut	79e18896fe	TabBar: Fixed using more than 32 KB-worth of tab names. (#4176 )	2021-05-27 12:01:00 +02:00
ocornut	1ad1429c6d	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # docs/CHANGELOG.txt	2021-05-25 18:45:54 +02:00
ocornut	e31d13fa76	Version 1.84 WIP	2021-05-25 13:36:53 +02:00
ocornut	1b435ae3e0	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2021-05-24 17:49:20 +02:00
ocornut	ad5d1a8429	Version 1.83	2021-05-24 17:39:25 +02:00
ocornut	029c83c73e	Combos: Changed the combo popup to use a different id to also using a context menu with the default item id. (#4167 )	2021-05-24 15:09:39 +02:00
ocornut	5d77b6f274	Docs: update links, sponsors	2021-05-21 15:24:57 +02:00
ocornut	105d82d134	Docking: Docking node tab bar honors ItemInnerSpacing.x before first tab. Tweak rendering and alignment of dock node menu marker. (#4130 ) + Fix ~0 in EndFrameDrawDimmedBackgrounds() which is obsolete way of signifying "all round corners".	2021-05-20 18:14:16 +02:00
ocornut	45f5ed52c1	Menus: made MenuItem() in a menu bar reflect the 'selected' argument with a highlight. (#4128 )	2021-05-20 15:00:36 +02:00
ocornut	86c2b609ef	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp # imgui.cpp	2021-05-19 19:05:01 +02:00
ocornut	e7e170c534	InputText: Internal renaming to use our own types to clarify code a little bit.	2021-05-18 14:48:54 +02:00
ocornut	26a1bbfe1e	InputText: Fixed CTRL+Arrow or OSX double-click leaking the presence of spaces when ImGuiInputTextFlags_Password is used. (#4155 , #4156 ) [@michael-swan]	2021-05-18 14:46:25 +02:00
ocornut	31290807dc	Merge branch 'master' into docking + fix warning fix for mingw+dx9 # Conflicts: # backends/imgui_impl_dx9.cpp # imgui.cpp	2021-04-30 22:52:46 +02:00
ocornut	393941ceea	Refactor focusable/tabbalbe item registration toward allowing to handle it prior to clipping (not yet the case) (#343 , #4079 ) Now performed in ItemAdd(). It can't be trivially moved above clipping effectively because it would require us to scroll to be useful, meaning we'd be better off locking the bounding box a frame earlier. Still wip. As-is this commit has no value for end-user, but it's a reengineering that moves us closer to the solution. + Internals: moved internal flags.	2021-04-30 22:40:02 +02:00
ocornut	9b90639577	Internals: ItemFlags is a shared resource as advertised. Fix Begin/PushItemFlags/End sequence (mostly for consistency)	2021-04-30 21:34:17 +02:00
ocornut	10a1c5b021	TestEngine: fixed wrong flags passed to ItemInfo queries. Was luckily/misleadingly not causing issues as the test-engine flags we tested were upper bits not colliding with the other type. Moved those flags higher as well. (unrelated to the fix itself)	2021-04-30 19:32:41 +02:00
ocornut	89162a04f4	Fixes for PVS Studio and MSVC static analyzers. Using a macro to suppress single-use MSVC false positives. (#3938 , #4073 )	2021-04-29 21:20:32 +02:00
ocornut	d28535f351	Fixes for Visual Studio 2019 static analyzers. (#3938 , #4073 ) + two minor edge case were invalid scalar input (e.g. a sign only) would return buffer as modified.	2021-04-29 17:10:27 +02:00
ocornut	2dec7b3301	InputText: Align caret/cursor to pixel coordinates. (#4080 )	2021-04-27 13:31:32 +02:00
ocornut	daf97832f1	Internals: Nav: renaming.	2021-04-23 18:39:08 +02:00
ocornut	34d4bc620d	Merge remote-tracking branch 'origin/master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp	2021-04-15 19:57:52 +02:00
ocornut	646c873598	Docking: Fixed reappearing docked windows with no close button showing a tab with extraneous space for one frame.	2021-04-13 16:12:14 +02:00
ocornut	c283a1da5b	Fixed clipping of multi-line value text when label is single-line + Fixed vertical alignment of single-line value text when label is multi-line. (#4004 )	2021-04-06 18:35:06 +02:00
Doug Binks	f08566b4d7	InputText: Do not filter private unicode codepoints (e.g. icons) when pasted from clipboard. (#4005 )	2021-04-06 12:00:52 +02:00
ocornut	6ddcdbe3e8	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_widgets.cpp	2021-03-31 16:41:17 +02:00
ocornut	9251eac585	Docking: fix undocking from tab-bar by moving mouse horizontally, amend `3ed07a8` + `d705192`. Automation system may drag e.g. right-most tab far left (and vice-versa) and one frame and our current logic would fail at it.	2021-03-30 19:01:37 +02:00
ocornut	3ed07a8f0b	Docking: removed io.ConfigDockingWithShift option. (#2109 )	2021-03-30 15:00:16 +02:00
ocornut	0e0a783b8c	Docking: fix undocking from tab-bar by moving mouse horizontally, broken by `d705192`.	2021-03-30 14:52:10 +02:00
Chris Ohk	eab3ae473c	Fix warning message C4100 (#3974 ) - warning C4100: 'fmt_out_size': unreferenced formal parameter	2021-03-27 17:11:57 +01:00
ocornut	1dcd3a45cc	ColorEdit4: Alpha default to 255 (instead of 0) when omitted in hex input. (#3973 ) Courtesy of @squadack	2021-03-26 11:34:07 +01:00
ocornut	b79b1cb9c0	TabBar: Amend previous commit. Fix tab reordering when tab bar has scrolling. Some tidying up with helpers + honor 16-bit offsets as with other tab bar features (unlikely single reorder can reach that but consistent)	2021-03-25 19:17:30 +01:00
ocornut	688e06490e	TabBar: Amend previous commit. Fix tab reordering when tab bar has scrolling. Some tidying up with helpers + honor 16-bit offsets as with other tab bar features (unlikely single reorder can reach that but consistent)	2021-03-25 19:16:24 +01:00
Rokas Kupstys	d7051928d9	TabBar: Use mouse position instead of hardcoded +1/-1 offset when reordering tabs. Fixes tab reordering in test engine when using fast mode. # Conflicts: # imgui_widgets.cpp	2021-03-25 19:15:36 +01:00
Rokas Kupstys	475c0fcc39	TabBar: Use mouse position instead of hardcoded +1/-1 offset when reordering tabs. Fixes tab reordering in test engine when using fast mode.	2021-03-25 19:12:49 +01:00
ocornut	e7577d570e	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2021-03-25 16:57:01 +01:00
ocornut	a58271c079	Internals: extracted a more reusable BeginViewportSideBar() out of BeginMainMenuBar(). (#3966 , #3518 ) Complement `ca34c81c` in docking branch which removed assumption that we can't tell size ahead of Begin().	2021-03-25 16:20:42 +01:00
ocornut	ca34c81ce9	BeginMainMenuBar(): remove expectation that we don't know menu bar height ahead, allowing up to generalize placement in any direction (will be done in master) Amend `75de34e281`	2021-03-25 15:21:23 +01:00
ocornut	59da01901e	Scrolling: Fix scroll tracking with e.g. SetScrollHereX/Y() when WindowPadding < ItemSpacing. Fix scroll snapping on edge of scroll region when both scrollbars are enabled. CalcNextScrollFromScrollTargetAndClamp() fixed snapping edge calculation missing ScrollbarSizes.y	2021-03-19 16:58:23 +01:00
ocornut	81e0b18e38	Merge branch 'master' into docking	2021-03-16 16:10:29 +01:00
ocornut	a1a39c632a	Version 1.83 WIP	2021-03-16 14:45:30 +01:00
ocornut	4bf646e4b0	Drags, Sliders, Inputs: Specifying a NULL format to Float functions default them to "%.3f" to be consistent with the compile-time default. (#3922 )	2021-03-16 12:59:35 +01:00
ocornut	256594575d	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2021-03-15 20:38:34 +01:00
ocornut	35b1148efb	Version 1.82	2021-03-15 20:26:48 +01:00
ocornut	352f64697c	Internals: rename legagy tab focus fields to TabFocusXXXX for clarity + removed one unnecessary FocusWindow() call.	2021-03-15 20:10:08 +01:00
ocornut	d94644261d	Drags, Sliders: Support ImGuiSliderFlags_Logarithmic flag with integers. Because why not? (#3786 ) Renamed is_decimal to is_floating_point.	2021-03-15 12:21:37 +01:00
ocornut	287bd9b984	InputText: renamed ImGuiInputTextFlags_AlwaysInsertMode to ImGuiInputTextFlags_AlwaysOverwrite. (#2863 )	2021-03-12 18:23:30 +01:00
ocornut	0157502eab	ImDrawFlags: rework/revert `c2d6d26` + `39432bf` in a way that is closer to old version and back to opt-in but with default 0 = all corners.	2021-03-12 16:33:29 +01:00
ocornut	033dfd9d35	ImDrawFlags: rework/revert `c2d6d26` + `39432bf` in a way that is closer to old version and back to opt-in but with default 0 = all corners.	2021-03-12 16:31:46 +01:00
ocornut	f1bf642e8f	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # misc/debuggers/imgui.natvis	2021-03-11 16:32:14 +01:00
Rokas Kupstys	c2d6d26139	ImDrawList: upgraded AddRect(), AddRectFilled(), PathRect() to use general ImDrawFlags instead of ImDrawCornersFlags	2021-03-11 16:03:32 +01:00
C.Even	a3ebd160cb	Fix unused variable warning in ImGui::EndListBox() (#3897 )	2021-03-11 10:04:50 +01:00
ocornut	6ba1334903	Nav: internals: renaming ImGuiInputSource so it is not specific to nav. Comments.	2021-03-10 16:36:39 +01:00
Rokas Kupstys	01a2bac7d5	DrawList: Replace "bool close" in drawing functions with flags.	2021-03-10 12:57:01 +01:00
ocornut	a64e0eb3a4	Nav: merged SetNavID() and SetNavIDWithRectRel() to improve sanity, moved flags overwrite off them. (#787 )	2021-03-09 17:21:01 +01:00
ocornut	4bb5a36f90	Nav: do not clear per-window NavId when window reappears. Process NavInit regardless of current highllight state. Consistently set g.NavLayer in SetNavID(). (#787 )	2021-03-09 12:39:18 +01:00
ocornut	e842b196df	Amend sanitization of format strings. Support ' without stb_printf. Simpler loops, will also be used for ImStrv branch. (`8ee77f1`) (#3604 ) Widgets: Sliders: Fix a bug where numbers after format specifier (eg. %d123) would cause RoundScalarWithFormatT() return incorrect value.	2021-03-05 18:27:35 +01:00
Rokas Kupstys	8ee77f1b65	Widgets: Sliders: Skip custom stb_sprintf.h format flags (', #, _) in RoundScalarWithFormatT() as they break ImAtof()/ImAtoi() and cause Drag()/Slider() widgets display incorrect values. (#3604 ) Widgets: Sliders: Fix a bug where numbers after format specifier (eg. %d123) would cause RoundScalarWithFormatT() return incorrect value.	2021-03-05 18:06:54 +01:00
ocornut	705f082674	Internals: rename RootWindow->RootWindowDockTree, RootWindowDockStop->RootWindow. Why? So by default RootWindow matches user expectation on both branches, and RootWindowDockTree is more intentful. (Actually should reduce diff between master<>docking)	2021-03-05 16:24:29 +01:00
ocornut	80533ea5e1	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_widgets.cpp	2021-03-05 16:04:15 +01:00
ocornut	fdebb2e093	Internals: removed HoveredRootWindow, tweak IsWindowHovered().	2021-03-05 15:56:59 +01:00
ocornut	6aee4bcdc5	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp	2021-03-02 18:27:07 +01:00
ocornut	3776ba565f	Internals: TabBar: minor tweaks and renaming.	2021-02-24 19:40:15 +01:00
ocornut	a8f76c23a4	Window: Shrink close button hit-testing region when it covers an abnormally high portion of the window visible area (e.g. when window is collapsed and moved in a corner)to facilitate moving the window away. (#3825 )	2021-02-18 17:23:10 +01:00
ocornut	0ecdf8167c	DragScalar: Fixed crash when using DragScalar() directly with ImGuiSliderFlags_AlwaysClamp + only one of either p_min or p_max set. (#3824 ) [@harry75369]	2021-02-18 16:12:41 +01:00
ocornut	ffa863a3ba	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # imgui.cpp	2021-02-18 11:41:27 +01:00
ocornut	30b7545841	Version 1.82 WIP	2021-02-15 18:10:14 +01:00
ocornut	239d09804d	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2021-02-10 21:28:16 +01:00
ocornut	4df57136e9	Version 1.81	2021-02-10 21:16:58 +01:00
ocornut	f14042ca78	Viewports Added ImGui::GetMainViewport() as a way to get the bounds and work area of the host display. (#3789 , #1542 ) Viewports: Backport a few constructs from 'docking' branch. Viewports: Added ImGuiViewportFlags_IsPlatformWindow, ImGuiViewportFlags_IsPlatformMonitor, ImGuiViewportFlags_OwnedByApp (none of them were in docking branch yet). ImGuiViewportFlags_IsPlatformMonitor is merely there to convey future intent, not yet used. Reduce uses of io.DisplaySize. MainMenuBar: Backport work area handling code from 'docking' branch. Metrics: Backported "Viewports" debug visualizer from 'docking' branch. Demo: Rework 'Examples->Fullscreen Window'. Demo: 'Simple Overlay' demo now moves under main menu-bar (if any) using GetMainViewport()'s work area.	2021-02-10 16:09:53 +01:00
ocornut	2a5eaf239f	Misc tweaks - mostly toward minimizing diff in upcoming backport merge of a few viewport structures in master	2021-02-10 14:28:04 +01:00
ocornut	7a516a266d	Merge remote-tracking branch 'origin/master' into docking # Conflicts: # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2021-02-09 13:17:24 +01:00
ocornut	1a3af8cb4c	Viewports: trying to treat GetMainViewport() as const. Reducing unnecessary casts of ImGuiViewportP* Metrics: readded root Drawlists node in metrics to match master. The (void*) casts are implying const-casst but currently left GetMainViewport() as returning non-const.	2021-02-09 13:15:01 +01:00
ocornut	fa55b0cb60	Viewports: (breaking) removed ImGuiPlatformIO::MainViewport which is now pretty much unused and duplicate (and misleading as we will evolve the concept) Use GetMainViewport() if stuck.	2021-02-05 16:14:47 +01:00
ocornut	03d74a293d	ListBox: renamed ListBoxHeader>BeginListBox, ListBoxFooter>EndListBox. Added demo bits.	2021-02-03 16:33:22 +01:00
ocornut	6f6d4e0b70	ListBoxHeader: In version taking height in number of items, made vertical padding consistent regardless of if (items_count <= height_in_items) or not. Demo: Tweaks.	2021-02-03 15:07:14 +01:00
ocornut	e5cbf60def	ListBox: tweaked default height calculation. simplifying code internally (rework passing of full rect). Should have no visible side-effects + misc comments.	2021-02-03 14:54:56 +01:00
freddii	90a518c501	Fixed typos (#3782 )	2021-02-03 12:37:32 +01:00
ocornut	d1a9efdd8f	InputText: Fixed slightly off ScrollX tracking, noticeable with large values of FramePadding.x. Multiline: Fixed padding/cliprect not matching single-line version. (#3781 ) Fixed FramePadding.y worth of vertical offset when aiming with mouse.	2021-02-02 16:30:57 +01:00
ocornut	a3f0393351	Menus: Fixed an issue with child-menu auto-sizing (issue introduced by `6af92b0`) (#3779 )	2021-02-02 13:06:51 +01:00
ocornut	929563c3a7	Log/Capture: Fixes for handling \n in strings. Improve the look of various widgets. Added LogSetNextTextDecoration helper. Fixup/amend `dbaf74d75`. For now removed LogRenderedTextNewLine() - it is eventually desirable but currently carries too much ambiguities, so reverted until we have a better system and test suite.	2021-02-02 12:29:58 +01:00
Louis Schnellbach	dbaf74d758	Log/Capture: Fix various new line/spacing issue by using same render text position when there are both RenderText and LogRenderedText call in widget code. Also Buttons are now enclosed in bracket	2021-02-02 09:38:57 +01:00
Erwin Coumans	4dec436161	SliderInt: Fixed click/drag when v_min==v_max from setting the value to zero. (#3774 )	2021-02-01 17:34:16 +01:00
ocornut	577e7cb493	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp	2021-01-28 21:02:13 +01:00
Sammy Fatnassi	376c88a864	Fixed some compile warnings with Clang on Windows (#3754 )	2021-01-26 14:10:10 +01:00
ocornut	2ed47e5822	Version 1.81 WIP	2021-01-25 16:30:44 +01:00
ocornut	bb26751b94	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2021-01-21 20:38:42 +01:00
ocornut	58075c4414	Version 1.80	2021-01-21 20:36:18 +01:00
ocornut	6737037743	Tab Bar: fix `0ea4408` (#3414 )	2021-01-20 19:35:10 +01:00
ocornut	74b3b7cf58	Added experimental io.ConfigDragClickToInputText feature to enable turning DragXXX widgets into text input with a simple mouse click-release (without moving). (#3737 ) + Offset ImGuiTableColumnFlags values.	2021-01-20 19:18:03 +01:00
ocornut	dc0f3d982c	DragFloat, DragInt: very slightly increased mouse drag threshold + expressing it as a factor of default value + disabled experimental click-to-input on DragXXX functions. (#3737 )	2021-01-20 18:36:21 +01:00
ocornut	0ea4408fd4	Tab Bar: Requested ideal content size (for auto-fit) doesn't affect horizontal scrolling. Followup to afa01d8. (#3414 ) + minor Table rename	2021-01-15 22:52:47 +01:00
ocornut	6af92b05bf	Internals: Layout: maintain two content sizes, optionally writing to IdealMaxPos to distinguish used from ideal size, later is used for auto-fit. Unused in this commit, should be no-op. (#3414 ) # Conflicts: # imgui.cpp	2021-01-15 22:52:42 +01:00
ocornut	388ca563db	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx12.cpp	2021-01-15 19:20:42 +01:00
ocornut	b0db741770	Demo tweaks. Moved Tabs to Widgets section. Added to Tables demo. Increased version following `00b35c08`.	2021-01-14 11:59:33 +01:00
ocornut	002ba1a69f	Tables: comments, tweak. CollapsingHeader: comments. (#3715 )	2021-01-13 10:07:59 +01:00
ocornut	b11518d7d7	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp # imgui.cpp	2021-01-05 16:46:38 +01:00
ocornut	9bcf77eb81	Fixed using IsItemEdited() after Combo() not matching the return value from Combo(). (#2034 ) + fix some PVS warnings, fix typo, blanks. Amend `e28b1078`	2021-01-04 19:15:20 +01:00
ocornut	1c1d3b7ab5	Added 64-bit variants of CheckboxFlags() in imgui_internal.h. Improve assert on mismatched ListBoxFooter() call. Fix FAQ index. (#3687 )	2021-01-03 15:45:56 +01:00
ocornut	b015ea93fd	Style tweaks, disabled default window rounding by default, reduced size of resize grip, made less prominent, increased WindowBg alpha in classic style. TestEngine: Fixed Checkbox() not reporting its checkable state when clipped.	2020-12-24 18:31:51 +01:00
ocornut	7b53551032	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2020-12-22 17:17:49 +01:00
ocornut	1fb26d18c4	Tables: fixed seemingly unnecessarily copy of ImGuiTableColumnFlags_NoDirectResize_ which broken resizing from W3\| in a F1 W3 F2 setup. Header only allow overlap on hover, not when active (amend `f2df804f`) Otherwise TableUpdateBorders() tends to override mouse cursor.	2020-12-16 15:43:51 +01:00
ocornut	dd4ca70b0d	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_demo.cpp	2020-12-04 19:22:15 +01:00
ocornut	7aed4b152b	Tables: improve index, file structure tweaks.	2020-12-04 19:15:26 +01:00
ocornut	5ef7b831c2	Tables: removed ImGuiTableSortSpecs::ColumnsMask because it needlessly exposes our 64-columns limitation which we'd eventually would like to lift + shuffle declarations in internals	2020-12-04 19:15:26 +01:00
ocornut	82cf41d804	Tables: tooltip on clipped TableHeader() (amended)	2020-12-04 19:15:25 +01:00
ocornut	507db499e4	Tables: work on background draw channel handling (amend "create a separate background draw channel") + Selectable disable spacing when spanning.	2020-12-04 19:15:25 +01:00
omar	8e97cdf8e8	Tables: Fix for calling TableSetBgColor(ImGuiTableBgTarget_CellBg) multiple times on the same cell.	2020-12-04 19:15:23 +01:00
omar	8da7d3c3e5	Tables: Initial commit. [Squashed 123+5 commits from tables_wip/]	2020-12-04 19:15:19 +01:00
ocornut	818e1a4eb4	Tables: Moving legacy Columns code	2020-12-04 19:15:19 +01:00
ocornut	c1ffac2fee	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2020-12-03 20:05:49 +01:00
ocornut	ae3e2406ec	Misc tweaks/fixes (see details). Combo: ultra minor fix for popup positioning policy mismatch depending on ImGuiComboFlags_PopupAlignLeft flag. Made ImHashXXX functions return ImGuiID. IsWindowNavFocusable use !WasActive.. it worked because it was only called in NewFrame()->NavUpdate() before the transition loop + EndFrame() only. Fix unused variable warning.	2020-11-30 12:47:14 +01:00
ocornut	d4f08d893e	InputText: Fixed swiching from single to multi-line while preserving same ID.	2020-11-19 18:30:14 +01:00
ocornut	c0ac4fb788	Columns/Internals: (Breaking): Renamed data structures. (#125 , #513 , #913 , #1204 , #1444 , #2142 , #2707 )	2020-11-18 23:42:44 +01:00
ocornut	72de6f3360	Columns/Internals: (Breaking) renamed ImGuiColumnsFlags_* to ImGuiOldColumnFlags_*. (#125 , #513 , #913 , #1204 , #1444 , #2142 , #2707 ) Affected: ImGuiColumnsFlags_None, ImGuiColumnsFlags_NoBorder, ImGuiColumnsFlags_NoResize, ImGuiColumnsFlags_NoPreserveWidths, ImGuiColumnsFlags_NoForceWithinWindow, ImGuiColumnsFlags_GrowParentContentsSize. Added redirection enums. Did not add redirection type.	2020-11-18 23:02:14 +01:00
ocornut	b2a91dc390	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-11-13 22:04:28 +01:00
ocornut	6e94013a3d	Made ItemFlagsStack and GroupStack shared stacks.	2020-11-13 16:33:33 +01:00
ocornut	a138855d56	Hotfix for PushFocusScope() being utterly wrong (until we split the stacks), Added asserts on PopID to help catch bugs, Added GC trigger.	2020-11-12 22:59:05 +01:00
ocornut	61825c7735	Tab Bar: Fixed minor/unlikely bug skipping over a button when scrolling left with arrows + InputText: minor optimization.	2020-11-11 12:04:35 +01:00
顾起威	2785ac0ee3	InputText: Fixed updating cursor/selection position when a callback alters the buffer in a way where the byte count is unchanged but the decoded character count changes. (#3587 )	2020-11-11 11:36:53 +01:00
ocornut	ac08593b96	Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2020-11-05 21:36:22 +01:00
ocornut	5789e69a62	Checkbox: Added CheckboxFlags() helper with int* type. Demo: removed extraneous casts.	2020-11-05 21:32:05 +01:00
ocornut	5f97809cab	Misc tidying up (zero-clear structures, more unused default in ClipRetFullscreen, NavApplyItemToResult() coding style fix) Zero-clearing more structures Remove arbitrary default ClipRetFullscreen value in ImDrawListSharedData. Nav extracted NavApplyItemToResult() function. Coding style fixes in OSX Backends.	2020-11-05 13:24:27 +01:00
ocornut	046057cebb	Selectable: Avoid pushing span-column background if clipped.	2020-11-04 20:11:34 +01:00
ocornut	e3ac52630a	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.cpp	2020-10-31 00:47:57 +01:00
ocornut	044ed22379	Metrics: Fixed mishandling of ImDrawCmd::VtxOffset in wireframe mesh renderer + omitting trailing empty ImDrawCmd in count + relying on IdxOffset value.	2020-10-30 22:56:29 +01:00
ocornut	455c21df71	Merge branch 'master' into docking + dockspace demo comments # Conflicts: # backends/imgui_impl_opengl3.cpp # docs/CHANGELOG.txt # imgui_internal.h # imgui_widgets.cpp	2020-10-19 15:08:32 +02:00
ocornut	e6b99a420b	Tab Bar: Do not display a tooltip if the name already fits over a given tab. (#3521 )	2020-10-19 15:01:24 +02:00
ocornut	fbe74ed50c	Tab Bar: zero clear more structures.	2020-10-19 12:10:31 +02:00
ocornut	8c9b3c9013	Tab Bar: Fixed using more than 128 tabs in a tab bar. Using ImS16 consistently + some better packing to avoid struct growing size.	2020-10-19 12:01:15 +02:00
ocornut	748bd1ba9c	Tab Bar: Restore cursor position in EndTabBar() when amending (amend `f2f32602`) + made LastTabItemIdx consistent ImS8 as other tab storage relies on same type	2020-10-19 11:49:37 +02:00
ocornut	d015004f45	Rename colored>color in comments where possible (#3528 )	2020-10-15 20:05:35 +02:00
ocornut	d3a80d9f1b	Internals: Docking: More fixes to make DockNodeBeginAmendTabBar() viable (probably some issues left)	2020-10-15 15:02:05 +02:00
ocornut	b26f1530b7	Internals: Docking, Tab Bar: Add DockNodeBeginAmendTabBar() and work toward making hybrid dock node with windows tab bars somehow work (not done).	2020-10-15 12:18:20 +02:00
ocornut	bae2240eda	Tab Bar: Made it possible to append to an existing tab bar by calling BeginTabBar()/EndTabBar() again. # Conflicts: # imgui_widgets.cpp	2020-10-14 18:36:03 +02:00
ocornut	f2f326024c	Tab Bar: Made it possible to append to an existing tab bar by calling BeginTabBar()/EndTabBar() again.	2020-10-14 18:34:33 +02:00
ocornut	042a3b01d2	Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx10.h # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # examples/README.txt # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_directx11/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 # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2020-10-14 14:44:03 +02:00
ocornut	124c2608f1	Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency.	2020-10-12 17:54:52 +02:00
ocornut	041ef01b33	Removed redirecting functions/enums names that were marked obsolete in 1.61: InputFloat, InputFloat2, InputFloat3, InputFloat4 with int decimal_precision parameter. (#648 , #712 )	2020-10-12 15:09:21 +02:00
ocornut	04de5ef819	Version 1.80 WIP	2020-10-12 13:04:34 +02:00
ocornut	682249396f	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2020-10-08 16:05:55 +02:00
ocornut	e5cb04b132	Version 1.79 + Update readme and mission statement. Removed "Minimize screen reel-estate usage", removed details on memory consumption (still very valid, just too much noise in a mission statement)	2020-10-08 16:01:59 +02:00
ocornut	03b1e643b4	Docs: Funding link, Tweaks, Gallery links.	2020-10-08 10:47:10 +02:00
ocornut	12d9505534	CheckboxFlags: Display mixed-value/tristate marker when passed flags that have multiple bits set and stored value matches neither zero neither the full set.	2020-10-07 15:13:04 +02:00
ocornut	4fd43a8b64	Internals: removed NavLayerCurrentMask (redundant, add extra shift in ItemAdd().	2020-10-05 14:52:18 +02:00
ocornut	958e58b06b	Merge branch 'master' into docking # Conflicts: # examples/example_apple_opengl2/main.mm # imgui.cpp	2020-10-01 13:33:08 +02:00
ocornut	5f336ce8f8	Tab Bar: Fixed buffer underflow in TabBarLayout, introduced by `4a57a982b` (#3501 , #3291 ) + Link to CI actions added in `3be352f`	2020-10-01 13:31:53 +02:00
ocornut	52c0b1a340	ImGuiListClipper: internal rework and tidying up to facilitate supporting frozen rows in tables + stop promoting using constructors parameters.	2020-09-28 17:25:34 +02:00
ocornut	324e0310ad	Renamed ImGuiSliderFlags_ClampOnInput to ImGuiSliderFlags_AlwaysClamp. (#1829 , #3209 , #946 , #413 )	2020-09-25 13:34:31 +02:00
ocornut	fbabf651f4	Style: Renamed style.TabMinWidthForUnselectedCloseButton to style.TabMinWidthForCloseButton. Fixed README links.	2020-09-25 13:22:28 +02:00
ocornut	fa004ae79a	Merge branch 'master' into docking # Conflicts: # examples/imgui_examples.sln # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx12.h # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_demo.cpp # imgui_internal.h # imgui_widgets.cpp	2020-09-22 17:00:57 +02:00
ocornut	1ec464eb9a	Tab Bar: Further simplification of section/clip rect handling. (#3291 )	2020-09-22 16:43:40 +02:00
ocornut	6b76781c66	Tab Bar: Tidying up. Rework ShrinkWidths to allow marking tabs as not shrinkable (unused yet) + don't unnecessarily move data within ShrinkWidthBuffer. (#3291 )	2020-09-22 16:43:39 +02:00
Louis Schnellbach	99f69eb185	Tab Bar: Moved up TabBarScrollingButtons function call. (#3291 )	2020-09-22 16:43:39 +02:00
ocornut	205874f5b1	Tab Bar: Fix reorderable tab bars. Fix misleading use of tab_max_width in TabBarLayout(). Misc amends, shortening. (#3291 )	2020-09-22 16:43:39 +02:00
Louis Schnellbach	3422cb1308	Tab Bar: Various fixes. Tried to reduce code complexity. (#3291 )	2020-09-22 16:43:39 +02:00
ocornut	5e5f25e2dd	Tab Bar: Rename named sections members into array. Various tidying up. (#3291 )	2020-09-22 16:43:39 +02:00
Louis Schnellbach	7ac16c02cc	Tab Bar: Fix multiple width and position computation issue. (#3291 )	2020-09-22 16:43:38 +02:00
ocornut	f23c39c395	Tab Bar: Fixed handling of scrolling policy with leading/trailing tabs. + warning fixes + bunch of renaming. (#3291 ) Demo tweaks.	2020-09-22 16:43:38 +02:00
Louis Schnellbach	4a57a982be	Tab Bar: Added TabItemButton(), ImGuiTabItemFlags_Leading, ImGuiTabItemFlags_Trailing + demo. (#3291 ) (squashed various commits by 2 authors)	2020-09-22 16:43:38 +02:00
ocornut	29836412e1	Internals, CollapsingHeader, TabItem: Standardized using a #CLOSE id prefix for TabItem and ColllapsingHeader (same as window)	2020-09-22 15:49:47 +02:00
ocornut	27d0c3afa9	Tab Bar: Fixed a small bug where scrolling buttons (with ImGuiTabBarFlags_FittingPolicyScroll) would generate an unnecessary extra draw call.	2020-09-21 20:00:25 +02:00
ocornut	afc1099fb5	Tab Bar: Fixed a small bug where closing a tab that is not selected would leave a tab hole for a frame.	2020-09-21 18:52:20 +02:00
ocornut	a58a727781	Renamed OpenPopupContextItem() back to OpenPopupOnItemClick(), reverting `99ab5210`	2020-09-21 14:45:35 +02:00
Louis Schnellbach	ec945f44b5	InputText: Added support for Page Up/Down in InputTextMultiline. (#3430 ) + fix stb_textedit.h to build with C language (amend `fbf70070`)	2020-09-18 14:15:17 +02:00
ocornut	c206a19373	Removed ImFont::DisplayOffset in favor of ImFontConfig::GlyphOffset. (#1619 ) + Fonts: AddFontDefault() adjust its vertical offset based on floor(size/13) instead of always +1.	2020-09-17 16:45:21 +02:00
ocornut	645a6e0342	Bypass unnecessary formatting when using the TextColored()/TextWrapped()/TextDisabled() helpers with a "%s" format string. (#3466 )	2020-09-16 18:36:42 +02:00
Bartosz Szreder	d2939ce0a1	Columns: Make sure the ClipRect is valid. (#3475 )	2020-09-16 16:52:57 +02:00
omar	78f753ffff	Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455 , #3459 )	2020-09-08 17:02:58 +02:00
omar	206d78a524	InputText: Fixed minor glitch when erasing trailing lines in InputTextMultiline(). Fixed cursor being partially covered after using Ctrl+End key. Removed unncessary one-empty-line-worth-of-scrolling.	2020-09-08 11:42:13 +02:00
omar	36af398056	Sliders: Fixed using ImGuiSliderFlags_ClampOnInput with reverse sliders. (#3432 , #3449 )	2020-09-07 19:52:11 +02:00
Rokas Kupstys	b2039aac67	Slider: Fixed to reach maximum value with inverted integer min/max ranges, both with signed and unsigned types. Added reverse Sliders to Demo. (#3432 , #3449 )	2020-09-07 17:57:23 +02:00
ocornut	751d153ca9	InputText: Fixed callback's helper DeleteChars() function when cursor is inside the deleted block. (#3454 ).	2020-09-03 19:09:57 +02:00
ocornut	8dacb4da20	Docking: Fixed DockNode tab bar initial order broken by `8c80d533d`	2020-09-02 12:11:45 +02:00
ocornut	34077c0140	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2020-09-01 12:07:35 +02:00
ocornut	ce230fc370	Internals: TabBar renaming and shuffling stuff around. + sneaking a readme change	2020-08-31 17:49:18 +02:00
ocornut	13f718337a	Internals: Added support for overriding locale decimal point, undocumented. (#2278 ) + Misc doc update. Doc: Mention IMGUI_VERSION_NUM in recent api breaking changes + textwrap some demo code.	2020-08-28 18:38:31 +02:00
ocornut	093afd4f7f	Internals: Added Name to ImGuiDataTypeInfo + minor misc comments in BeginGroup().	2020-08-26 21:00:43 +02:00
Louis Schnellbach	8c80d533d9	Tab Bar: Fixed a small bug where toggling a tab bar from Reorderable to not Reorderable would leave tabs reordered in the tab list popup.	2020-08-26 16:36:57 +02:00
ocornut	32be6c064b	InputText: Fixed using ImGuiInputTextFlags_Password with InputTextMultiline(). (#3427 , #3428 )	2020-08-25 20:08:24 +02:00
ocornut	e9053515bb	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp	2020-08-25 19:29:06 +02:00
ocornut	5919a6fa89	Tab Bar: Keep tab item close button visible while dragging a tab (independent of hovering state). Improve `08108cf`	2020-08-25 19:28:29 +02:00
ocornut	08108cf9ee	Tab Bar: Hide tab item close button while dragging a tab.	2020-08-25 16:48:31 +02:00
omar	2e50d0706b	Selectable: Tweaks. Added internal ImGuiSelectableFlags_NoPadWithHalfSpacing.	2020-08-24 16:31:00 +02:00
ocornut	7b0570d6ba	Revert "Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText()." This reverts commit 640d1f60ce140e4c2bf858ac2f2e8a96d432e6a4.	2020-08-21 20:15:07 +02:00
ocornut	fdf952108d	Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText().	2020-08-21 19:17:44 +02:00
ocornut	ad8fdc917f	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2020-08-20 22:42:14 +02:00
ocornut	9b50e691ed	TreeNode: Made clicking on arrow toggle toggle the open state on the Mouse Down event. Amend `05420ea2c`.	2020-08-20 22:38:00 +02:00
ocornut	9262609eaf	Version 1.79 WIP	2020-08-20 16:46:44 +02:00
ocornut	05a25e5f36	BeginMenuBar: Fixed minor bug where CursorPosMax gets pushed to CursorPos prior to calling BeginMenuBar(), so e.g. calling the function at the end of a window would often add +ItemSpacing.y to scrolling range.	2020-08-20 16:24:54 +02:00
ocornut	fc9ccad6b9	InputText: Add ImGuiInputTextFlags_CallbackEdit, selection helpers in ImGuiInputTextCallbackData(). Add simple InputText() callbacks demo.	2020-08-20 11:25:39 +02:00
ocornut	4c201994d4	DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. (#3361 )	2020-08-20 11:21:15 +02:00
ocornut	05bc204dbd	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.h	2020-08-18 17:51:43 +02:00
ocornut	95c99aaa4b	Version 1.78	2020-08-18 17:50:45 +02:00
ocornut	c6b01e8e1d	Drag, Sliders: Merged ImGuiDragFlags back into ImGuiSliderFlags. (#3361 , #1823 , #1316 , #642 , #1829 , #3209 ) Technically API breaking (but ImGuiDragFlags were pushed on master 16 hours ago)	2020-08-18 17:02:58 +02:00
ocornut	25a9209b75	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp	2020-08-17 23:29:17 +02:00
omar	f32663b33c	Drags, Sliders: Removed locking behavior with min > max (added in 1.73)	2020-08-17 22:10:42 +02:00
omar	7f8f0096d8	Internals: Renamed SliderCalcRatioFromValueT() -> ScaleRatioFromValueT(), SliderCalcValueFromRatioT() -> ScaleValueFromRatioT(). Replaced drag/slider flags with a single bool is_logarithmic in those functions.	2020-08-17 22:10:42 +02:00
omar	fb0f2ebd41	Drags, Sliders: Tweaks.	2020-08-17 22:10:42 +02:00
Ben Carter	fa279a6aa0	Drags, Sliders: Added deadzone to make selecting 0.0 on linear sliders easier, slider navigation delta accumulation. (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:42 +02:00
omar	f75b29e7be	Drags, Sliders: Added ImGuiDragFlags_NoInput/ImGuiSliderFlags_NoInput to disable turning widget into a text input with CTRL+Click or Nav Enter.	2020-08-17 22:10:42 +02:00
omar	8018623c5b	Drags, Sliders: Added ImGuiDragFlags_NoRoundToFormat / ImGuiSliderFlags_NoRoundToFormat flags (#642 )	2020-08-17 22:10:41 +02:00
omar	170d02bd99	Drags, Sliders: Added ImGuiDragFlags_ClampOnInput/ImGuiSliderFlags_ClampOnInput flags to force clamping value when using CTRL+Click to type in a value manually. (#1829 , #3209 )	2020-08-17 22:10:41 +02:00
omar	7607aea018	Drags, Sliders: Removed power features. Old entry points will pass-through if power=1.0f, otherwise assert + safe fallback. Remove 3 redirection functions (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:41 +02:00
omar	43c099f31e	Drags, Sliders: Logarithmic: Moved flags to internals, allowing 1.0f to pass by. (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:41 +02:00
omar	152dae9e2a	Drags, Sliders: Logarithmic: Split back flags into drag/slider flags. Moved to an obsolete section. (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:40 +02:00
Ben Carter	9f98b4e7f2	Drags, Sliders: Logarithmic: Added logarithmic mode support to drag widgets, extended API to add flags to drag/sliders (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:40 +02:00
Ben Carter	a252a287bf	Drags, Sliders: Logarithmic: WIP experiments with trying to make logarithmic sliders sensible (#3361 , #1823 , #1316 , #642 )	2020-08-17 22:10:40 +02:00
ocornut	46d75202b8	Tab Bar: Allow calling SetTabItemClosed() after a tab has been submitted (will process next frame). + larger combo height on TabBarTabListPopupButton()	2020-08-17 12:57:47 +02:00
omar	a5ba26806f	Make moving window prevent its active id from being stolen (#3392 , #3243 , #1738 ) Amend `7b3d379`, `615e9ae3`	2020-08-10 16:28:46 +02:00
omar	2c13a74a9d	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_vulkan/main.cpp # imgui.cpp	2020-08-10 11:35:51 +02:00
omar	89ac87cd91	Internals: Added SetLastItemData, rename ImGuiItemHoveredDataBackup to ImGuiLastItemDataBackup.	2020-08-10 11:31:55 +02:00
omar	b15b25bccd	TabBar: made a change to that declared ideal width (for auto-resize) won't lag by an extra frame. Vaguely relate to underlying (uncommited) work for #3291	2020-08-06 16:35:29 +02:00
omar	8074b49148	Selectable: Fixed highlight/hit extent when used with horizontal scrolling (in or outside columns). (#3187 , #3386 ) # Conflicts: # imgui_widgets.cpp	2020-08-05 19:24:07 +02:00
omar	963839373c	Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).	2020-08-03 21:31:42 +02:00
omar	de1588928b	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-08-03 19:54:31 +02:00
omar	4929a8e4a5	InvisibleButton: Made public a small selection of ImGuiButtonFlags (previously in imgui_internal.h) and allowed to pass them to InvisibleButton().	2020-08-03 18:45:30 +02:00
omar	a876ad877d	Window: Fixed clicking over an item which hovering has been disabled (e.g inhibited by a popup) from marking the window as moved. + comments	2020-08-03 18:05:20 +02:00
omar	70fa37527d	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_draw.cpp # imgui_internal.h	2020-07-29 15:15:14 +02:00
omar	bbd061538c	Internals: Drag/Sliders: simplified some code.	2020-07-24 13:00:56 +02:00
omar	b8c22bdb28	DragFloatRange2, DragIntRange2: Fixed an issue allowing to drag out of bounds when both min and max value are on the same value. (#1441 )	2020-07-23 19:05:18 +02:00
omar	fdc526e8f8	Stop advertisting for Drag v_min>v_max which was introduced in 1.73 likely for `0537ac00` then made unnecessary with `32c33c66`, added undocumented ImGuiItemFlags_ReadOnly as possible replacement (unused), (#211 )	2020-07-23 18:19:11 +02:00
omar	f79f0e42f7	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.h	2020-07-14 18:38:47 +02:00
omar	ab4ef822f0	Version 1.78 WIP	2020-06-30 16:56:09 +02:00
omar	90ea7e2f2f	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2020-06-30 16:43:16 +02:00
Rokas Kupstys	0738611559	Misc: Bunch of code formatting changes suggested by a pass running 'astyle'	2020-06-30 16:37:21 +02:00
omar	ddabfc3477	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2020-06-29 17:15:40 +02:00
omar	9418dcb693	Version 1.77 + fix minor clang-tidy warnings which seems reasonable	2020-06-29 15:54:28 +02:00
omar	5628416bd3	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2020-06-25 14:03:40 +02:00
omar	fed80b9537	Popups: Changed 'int mouse_buttons' to ImGuiPopupFlags. Added ImGuiPopupFlags_NoOpenOverExistingPopup, ImGuiPopupFlags_NoOpenOverItems. Refactored signature of BeginPopupContextWindow().	2020-06-23 20:05:15 +02:00
omar	5acf6d861a	Popups: Added ImGuiPopupFlags type, ImGuiPopupFlags_AnyPopupId and ImGuiPopupFlags_AnyPopupLevel flags for IsPopupOpen(). # Conflicts: # docs/CHANGELOG.txt	2020-06-23 20:00:32 +02:00
omar	e0ec69d84b	Internals: Added ImageButtonEx() helper to temporarily bypass ID issues (#2464 , #1390 )	2020-06-23 15:47:07 +02:00
omar	20d61f5f62	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-06-20 22:06:01 +02:00
omar	8ead38c100	Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.	2020-06-18 17:02:24 +02:00
omar	704723744e	Disabled latest overzealous warnings from Clang	2020-06-18 16:19:51 +02:00
Louis Schnellbach	b1d8309abc	Added ImGuiTabItemFlags_NoTooltip for individual Tab Item.	2020-06-18 15:55:10 +02:00
ocornut	99ab521024	Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point	2020-06-15 22:12:38 +02:00
ocornut	c658cba22b	Comments, reworded some !(xxx && xxx) complex expression to be a little less confusing.	2020-06-15 18:06:48 +02:00
omar	90c0c0c163	Columns: Lower overhead on column switches and switching to background channel. (second attempt for `9b3ce49`) Internals: Bits, comments, added ImRect::ToVec4()	2020-06-13 18:04:50 +02:00
ocornut	16da8e6da6	Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125 )" This reverts commit `9b3ce494fd`.	2020-06-10 17:54:19 +02:00
ocornut	9b3ce494fd	Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125 ) This change benefits Columns but was primarily made with Tables in mind.	2020-06-08 23:18:23 +02:00
ocornut	8baa4ccff5	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-06-06 20:31:24 +02:00
ocornut	78d5ccfb90	ImDrawList: PushColumnsBackground(): Fixed incorrect assert. (#3163 )	2020-06-06 18:54:46 +02:00
ocornut	41e8837f59	Comments, adding some spacing in ImVec2() constructors.	2020-06-02 18:13:54 +02:00
ocornut	615e9ae345	Docking: Fix undocking (#3243 ), amend `7b3d3798` (#1738 )	2020-05-18 15:08:47 +02:00
omar	e4d8267188	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-05-16 14:14:51 +02:00
Mr. Metric	39c978f499	Fix typo/bug introduced by `0679e056` (#3231 , #3209 , #1829 , #946 , #413 )	2020-05-15 10:51:51 +02:00
omar	582f4db59b	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2020-05-07 22:13:47 +02:00
omar	9ee442d3f0	Metrics: Added a "Settings" section with some details about persistent ini settings. InputText: Assert early on null buffer.	2020-05-07 21:34:44 +02:00
omar	0679e05677	Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float (#3209 , #1829 , #946 , #413 )	2020-05-07 12:27:21 +02:00
omar	5116eee108	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-05-04 15:05:07 +02:00
omar	b4dd28ffbb	Style: Added style.TabMinWidthForUnselectedCloseButton settings. Set to 0.0f (default) to always make a close button appear on hover (same as Chrome, VS). Set to FLT_MAX to only display a close button when selected (merely hovering is not enough). Set to an intermediary value to toggle behavior based on width (same as Firefox).	2020-05-04 14:58:21 +02:00
Ryan Pavlik	8cbff5ccb2	Fix various typos. (#3161 ) (found by Debian's lintian on a package that uses imgui.) (found by codespell.)	2020-04-28 16:10:15 +02:00
ocornut	266dff9bed	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_internal.h	2020-04-20 11:33:56 +02:00
ocornut	c0283c1289	TestEngine: Changed PushID hooks into GetID(), makes more sense and catches more information.	2020-04-20 11:31:30 +02:00
omar	9f9ff84ba1	TestEngine: Added PushID() hooks.	2020-04-16 16:59:46 +02:00
omar	b0e9092d6f	TestEngine: Added extra storage and global enable flag. Added missing ItemInfo hooks.	2020-04-16 16:56:15 +02:00
omar	1fd9e131e4	TreeNode: Fixed bug where dragging a payload over a TreeNode() with either _OpenOnDoubleClick or _OpenOnArrow would open the node. (#143 )	2020-04-15 13:06:05 +02:00
omar	54b38d88f7	TreeNode: Fixed bug where BeginDragDropSource() failed when the _OpenOnDoubleClick flag is set. Added basic demo code. (Amend `05420ea`)	2020-04-15 12:31:51 +02:00
omar	e8c986b34e	Version 1.77 WIP	2020-04-14 14:55:50 +02:00
omar	b8e2b2bd6b	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-04-12 20:24:18 +02:00
omar	5503c0a12e	Version 1.76 + fixed PVS warning, update demo binaries, update readme image	2020-04-12 20:18:47 +02:00
omar	f7852fa8e8	Internals: Extracted GetWindowScrollbarRect() out of Scrollbar() and tidying up code to make it more obvious how to draw over scrollbars. (#3114 )	2020-04-10 11:51:17 +02:00
omar	832fda8488	Fixed stray end of line blanks, added comments in .editorconfig, tweaked some headers.	2020-04-07 14:46:46 +02:00
omar	4e7ceb5f90	Plot: Internals: Added hovered index to PlotEx() function. (#2670 )	2020-04-07 12:11:06 +02:00
omar	3930472f34	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-04-06 18:16:13 +02:00
omar	6d03f93067	Docking: Fixed assert preventing dockspace from being stored into a tab. (#3101 )	2020-04-06 15:03:01 +02:00
omar	cc0d4e346a	Misc: Added an explicit compile-time test for non-scoped IM_ASSERT() macros to redirect users to a solution + fixed our stb wrappers. + Nav: Use nav layer enum, comments.	2020-04-03 12:41:33 +02:00
omar	11116eee80	Columns: undid the change in 1.75 were Columns()/BeginColumns() were preemptively limited to 64 columns with an assert. (#3037 , #125 ) Essentially reverting `9d444062f9`.	2020-04-02 20:01:48 +02:00
omar	fd56de1144	Nav: Store key mods associated to a nav request (for range_select) + use io.KeyMods. + renamed NavScoringRectScreen > NavScoringRect	2020-04-02 17:56:21 +02:00
omar	0e884304ee	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.h	2020-04-02 14:27:48 +02:00
omar	05420ea2cf	TreeNode: Made clicking on arrow with _OpenOnArrow toggle the open state on the Mouse Down event rather than the Mouse Down+Up sequence (this is rather standard behavior).	2020-04-02 14:26:33 +02:00
omar	ec2a24a5f1	Selectable: Allow using ImGuiSelectableFlags_SpanAllColumns in other columns than first. Comments. (#125 )	2020-03-26 20:33:39 +01:00
omar	5be5add1ad	Selectable: Removed extraneous WindowPadding.x worth of width when auto-sized selectable label goes off available width (would not be noticeable) + Renamed ImGuiSelectableFlags_DrawFillAvailWidth to ImGuiSelectableFlags_SpanAvailWidth.	2020-03-26 20:15:24 +01:00
omar	b4d1287011	Selectable: Clarifying the code around use of ImGuiSelectableFlags_DrawFillAvailWidth (with intent of trying to remove it). Amend old `6251d379`, `2bcafc86`	2020-03-26 17:02:10 +01:00
omar	7c11997bcc	Selectable: Fixed honoring style.SelectableTextAlign with unspecified size. (#2347 , #2601 )	2020-03-26 15:02:03 +01:00
omar	ac2247f551	Selectable: Removed seemingly ineffective text clipping offset in SpanAllColumns handling path + tweaks. made max_x absolutely to reduce confusion. amend `cf481e1`	2020-03-26 14:50:13 +01:00
Rokas Kupstys	e8568f3ec9	Menus: Fix appending to main menubar (#3068 ).	2020-03-24 18:20:06 +01:00
omar	16a9488c13	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_draw.cpp	2020-03-19 12:44:53 +01:00
omar	bdd31ec4db	Internal: Refactor: Moved RenderColorRectWithAlphaCheckerboard() to imgui_draw.cpp, tweaked signature.	2020-03-18 22:48:23 +01:00
omar	0bbbbe0f68	Internal: Refactor: Moved RenderArrow, RenderBullet, RenderCheckMark to imgui_draw.cpp, changed RenderCheckMark to avoid using ImGui context	2020-03-18 22:48:22 +01:00
ocornut	ea0399414c	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2020-03-11 22:30:34 +01:00
ocornut	9a46a19e99	Internals: Rename ImGuiSelectableFlags_PressedOnXXX to ImGuiSelectableFlags_SelectOnXXX, ImGuiButtonFlags_NoHoveredOnNav to ImGuiButtonFlags_NoHoveredOnFocus.	2020-03-11 21:07:32 +01:00
ocornut	aef057e975	Internals: Added GetInputTextState() + comments.	2020-03-07 15:55:05 +01:00
ocornut	05c3e0b898	Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2020-03-03 17:03:47 +01:00
omar	095dc996b0	Disable deprecated-enum-enum-conversion (#3040 , #2983 )	2020-03-02 16:13:48 +01:00
ocornut	24bd33ace8	Menus: Some renaming, comments, add to demo. Amend `0342a3c`. (#1207 )	2020-02-28 16:42:24 +01:00
Rokas Kupstys	0342a3c548	Menus: Implement BeginMenu() appending to existing menu when executed with same ID multiple times. (#1207 )	2020-02-28 16:35:33 +01:00
ocornut	75de34e281	Viewports, Docking: Added per-viewport work area system for e.g. menu-bars. Fixed DocksapceOverViewport() and demo code (overlay etc) (#3035 , #2889 , #2474 , #1542 , #2109 ) Clarified that BeginMenuMainBar() had an incorrect knowledge of its height (which was previously harmless). Designed to easily allow for status bars although we don't have/use them yet, but custom code could use them.	2020-02-26 23:58:45 +01:00
ocornut	898e91f20d	Internals: Added TempInputText() to facilitate creation of custom widgets, renamed TempInputTextScalar() to TempInputScalar() etc. (#2718 ) + Minor imgui.h/todo comments	2020-02-25 21:34:02 +01:00
Omar	ea3fc76038	BeginMenu: Fixed a bug where SetNextWindowXXX data before a BeginMenu() would not be cleared when the menu is not open. (#3030 )	2020-02-18 12:49:02 +01:00
Omar	bb1e6f8af6	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2020-02-17 18:33:59 +01:00
omar	ccaec1a270	Version 1.76 WIP	2020-02-11 16:56:56 +01:00
omar	30bb15672d	Remove trailing spaces	2020-02-10 23:22:03 +01:00
omar	d8948b5343	ColorButton: Added ImGuiColorEditFlags_NoBorder flag to remove the border normally enforced by default.	2020-02-10 21:24:03 +01:00
omar	8432d1bfc7	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2020-02-10 14:03:12 +01:00
omar	58b3e02b95	Version 1.75 Comments	2020-02-10 14:02:41 +01:00
omar	d37d25470a	Added IMGUI_DISABLE compile-time definition to make all headers and sources empty.	2020-02-09 17:08:33 +01:00
omar	f694244dec	InputText: Fix using a combination of _CallbackResize + _EnterReturnsTrue + lack of persisting user storage. (#3009 ) Amend `24ff25981` (#2006, #1443, #1008)	2020-02-04 15:19:49 +01:00
omar	bdbb2b21f5	Fix `83efdcec` from overflowing buffer + make it a single undo records + comments (#3008 )	2020-02-03 17:39:20 +01:00
Rokas Kupstys	83efdcec8d	Canceling text input with [esc] key uses stb_textedit facilities to restore original value. This makes restoration undoable using hotkeys. Fixes #3008.	2020-02-03 15:50:17 +01:00
omar	5be649e082	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2020-02-02 21:21:54 +01:00
omar	d19297e2fa	InputTextMultiline: Provide label to BeginChildEx so internal window name hold a little more context.	2020-01-31 14:42:59 +01:00
Rokas Kupstys	9cff4d6e5e	Columns: ImDrawList::Channels* functions now work inside columns. Use a private splitter in columns, paving way for removal of obsolete ImDrawList::Channels* functions.	2020-01-31 12:02:56 +01:00
omar	e7bfcb970e	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2020-01-30 15:21:16 +01:00
omar	0e89041997	Internals: ButtonEx, ButtonBehavior can support multiple mouse buttons.	2020-01-29 18:55:49 +01:00
omar	bbe946fb6c	Minor fixes/tweaks (some to reduce drift wiih master branch)	2020-01-28 20:08:04 +01:00
omar	5f4dfad5b7	Merge misc/shallow changes from Docking to reduce drift. Most are comments. Fix menu bar clipping: `07ff47bf1b`	2020-01-28 20:06:34 +01:00
omar	6c1a73774d	Tooltip: Testing DragDropWithinSourceOrTarget in BeginTooltipEx() instead of just BeginTooltip() - feel this was an overlook. Added tooltip flags instead of using bool.	2020-01-27 22:02:43 +01:00
omar	f5528001f6	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # imgui.cpp # imgui_internal.h	2020-01-27 14:57:00 +01:00
omar	2eda3585e7	Fixed hoverable/focus bug introduced in `3fe6ae97` (#2997 ) + ArrowButtonEx() internal bits.	2020-01-22 15:20:49 +01:00
omar	2478dbfdb7	Disable warning C5054 introduced in VS 2019 16.2 (#2983 )	2020-01-17 14:18:16 +01:00
omar	9ad4c5da7e	Fix zealous warnings + Internals: Renamed members from XxxxID to XxxxxId to be more consistent with rest of the codebase (still some inconsistency left that are harder to fix)	2020-01-16 23:44:05 +01:00
omar	44174b1fa1	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h	2020-01-14 20:01:27 +01:00
omar	2ebe08be40	Focus, Nav: Merged bits from RangeSelect features to enable early manipulation of focus scope for styling purpose. FocusScopeId is tracked by nav scoring/request and stored in result. It's all rather WIP and we should reorganize the SetNavIDXXX functions fiasco at some point (soon?). Didn't separate FocusScope from SelectionScope for now, will re-investigate this later, this is the minimum commit to be able to do some styling.	2020-01-14 19:25:20 +01:00
omar	e2eb0b4bc4	Internals: Begin tries to setup WindowTemp/DC members in same order as their declaration. Readme: remove Coverity banner (PVS is better)	2020-01-13 16:50:56 +01:00
omar	02c2d18aa3	Internals: Renaming and marking of legacy focus/tabbing system	2020-01-13 15:21:37 +01:00
omar	52334ad8df	Internals: Minor ordering/comments of ImGuiWindowTempData.	2020-01-13 15:04:28 +01:00
omar	f56962cb9a	ColorEdit: "Copy As" context-menu tool shows hex values with a '#' prefix instead of '0x' + both with/without alpha when available.	2020-01-13 14:09:42 +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	4ee7aa72e9	ButtonBehavior: Default assignment of pressed behavior now also test for ImGuiButtonFlags_PressedOnDragDropHold which wasn't the case before.	2020-01-10 14:35:03 +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
Rokas Kupstys	e254167afd	ColorEdit: Fix label alignment when using ImGuiColorEditFlags_NoInputs. (#2955 )	2020-01-06 16:26:14 +01:00
omar	d581939387	Removed trailing spaces.	2020-01-06 15:24:16 +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	e01fb5462d	Internals: Separator: Simplify duplicated code.	2019-12-18 18:26:28 +01:00
omar	9d444062f9	Limiting Columns()/BeginColumns() api to 64 columns (#125 ) While the current code technically supports it, future code may not so we're putting the restriction ahead.	2019-12-17 13:25:46 +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	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	b521cd357d	Removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions. (none of the other functions have it).	2019-12-05 18:33: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	8d1b82d596	Docking: Internals: Rename StartMouseDragFromTitleBar() -> StartMouseMovingWindowOrNode(), clarify.	2019-11-27 15:51:15 +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	51a02b319c	Added IM_UNICODE_CODEPOINT_MAX. Changed specs of ImFontAtlas::AddCustomRectRegular() (breaking change).	2019-11-21 14:13:17 +01:00
omar	ca63349eb4	Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.	2019-11-20 11:58:25 +01:00
omar	3895363432	Merge branch 'master' into docking inc alter GetWindowResizeID # Conflicts: # imgui.cpp	2019-11-18 13:58:50 +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	03852470de	Internals: Routing recoverable user errors via IMGUI_USER_ERROR() macro. (#1651 )	2019-11-13 21:58:18 +01:00
omar	b138f8cbcd	Internal: Nav rename preparing for nav inputs ownership changes. IsNavInputPressed() -> IsNavInputTest()	2019-11-13 21:02:25 +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	037126ee0e	TreeNode: Reworded code for ImGuiTreeNodeFlags_OpenOnArrow (follow up to `f79b2d6c`) to make it lightweight. Should be a no-op from user's point of view. Will facilitate using the arrow hovering information in the hot path. (#2886 )	2019-11-08 15:00:28 +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	9b323a7ebf	SplitterBehavior: not using FrameRounding in render (was in first commit of the function, not sure why). (#319 )	2019-10-25 11:05:14 +02: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
Alexey	be9f1e8f00	ColorPicker: Fixed SV triangle gradient to block (broken in 1.73). (#2864 , #2711 ). [@lewa-j]	2019-10-23 00:43:40 +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
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 `bc165df6fd`)	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	aeb6481499	InputText: Filter out Ascii 127 (DEL) emitted by low-level OSX layer, as we are using the Key value. (#2578 )	2019-10-12 14:27:37 +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	927472f5ff	Combo: Added _NoMove flag to prevent window from docking, which has an effect in Docking branch (in Master was not noticeable as the Combo code kept repositioning the window). (#2835 )	2019-10-07 19:14:08 +02:00
omar	73fa6509a5	Internal: InputTextEx: tweaked a bit of code (should be a no-op)	2019-10-05 16:57:12 +02:00
omar	e0c0e53edf	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt	2019-10-04 19:22:42 +02:00
omar	ee3373d067	TreeNode: Fixed combination of ImGuiTreeNodeFlags_SpanFullWidth and ImGuiTreeNodeFlags_OpenOnArrow incorrectly locating the arrow hit position to the left of the frame. (#2451 , #2438 , #1897 )	2019-10-04 19:21:29 +02:00
domgho	ccb2a947a2	Internal: SliderBehaviorT: Condition '!is_decimal' is always true (#2828 )	2019-10-04 11:57:20 +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
goran-w	e100523917	CollapsingHeader: Added support for ImGuiTreeNodeFlags_Bullet and ImGuiTreeNodeFlags_Leaf on framed nodes. (#2159 , #2160 ) The Bullet and Leaf ImGuiTreeNodeFlags are now taken into account for Framed/CollapsingHeader tree nodes as well. TreeNodeEx() can be used to specify these flags. A choice was made to left-adjust the Framed text when no Bullet/Arrow is rendered, since this was deemed to look better in the Framed context (especially when considering that CollapsingHeader is drawn using NoTreePushOnOpen, so child/sibling Text items etc will often be non-indented).	2019-09-24 12:48: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	80b3ab7d3e	TabBar: Fixed single tab shrinking reducing the tab to 0.0f size. Broken by `a856c670c1`.	2019-09-22 22:16:05 +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	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	3f986e72d9	Internal: Offset STB_TEXTURE_K_ defines to remove that change from #2541 + sponsors update.	2019-09-17 12:06:31 +02:00
omar	7d5a17e5e4	Remove trailing spaces (grep for ' \r?$' in visual studio)	2019-09-17 11:33:18 +02:00
omar	404dc0367e	BeginTabItem: Fixed case where right-most tab would create an extraneous draw calls (probably related to other tab fitting code in 1.73 wip)	2019-09-17 11:12:33 +02:00
omar	3dcf323c35	Columns: Separator: Fixed a bug where non-visible separators within columns would alter the next row position differently than visible ones. Fixed rounding issues also leading to change of ScrollMax depending on visible items (in particular negative coordinate would be rounded differently)	2019-09-16 19:15:43 +02:00
Bagrat Dabaghyan	3cf519c9cb	Fix DragScalar for unsigned types (#2780 ) decreasing the value was broken on arm64	2019-09-16 19:01:39 +02:00
omar	0bdc145343	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-31 19:19:00 +02:00
omar	0537ac005f	ColorEdit: Disable Hue edit when Saturation==0 instead of letting Hue values jump around.	2019-08-30 20:33:35 +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	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	f8d3d8d7f5	TabBar: improved shrinking for large number of tabs to avoid leaving extraneous space on the right side. Individuals tabs are given integer-rounded width and remainder is spread between tabs left-to-right.	2019-08-29 12:21:09 +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	a856c670c1	TabBar: fixed single-tab not shrinking their width down. + minor typo fixes (#2738)	2019-08-22 11:38:58 +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	7abd41bd5f	TabBar: fixed ScrollToBar request creating bouncing loop when tab is larger than available space.	2019-08-19 20:38:17 +02:00
omar	9fce278918	ColorPicker: Made rendering aware of global style alpha of the picker can be faded out. (#2711 ) Note that some elements won't accurately fade down with the same intensity, and the color wheel when enabled will have small overlap glitches with (style.Alpha < 1.0).	2019-08-16 11:46:11 +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	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	5ef7445d92	Internal: Avoid using GImGui multiple times in same function.	2019-07-30 16:51:12 -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	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	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	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	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	34cf00566f	InputTextMultiline: Fixed vertical scrolling tracking glitch. Fixed Travis-CI banner address.	2019-07-22 18:11:06 -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	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	c37f21788f	Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with other column functions + fixed Columns demo (#2683 )	2019-07-21 11:23:15 -07:00
omar	9f35ba8546	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-07-19 15:19:10 -07:00
omar	b443bc0a64	Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. (#125 , #2666 )	2019-07-19 14:22:33 -07:00
omar	4abc2a82e0	Columns: Made the right-most edge reaches up to the clipping rectangle (removing WindowPadding.x*0.5 worth of asymmetrical/extraneous padding). (#125 , #2666 ) + Moved a few things in BeginColumns().	2019-07-19 14:22:12 -07:00
omar	493795cdd1	Columns: Fix support for BeginColumns() with a count of 1 (not that this isn't available via the old Columns() api). Tweaked Demo to facilitate testing for it.	2019-07-19 12:11:00 -07:00
omar	44336950e9	Revert "Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. (#125 , #2666 )" This reverts commit `6c16ba6490`.	2019-07-19 11:22:39 -07:00
omar	7fd34d4f30	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-07-17 18:48:16 -07:00
omar	6c16ba6490	Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. (#125 , #2666 )	2019-07-17 18:40:48 -07:00
omar	e28d20c3e2	Columns: Fixed a regression from 1.71 where the right-side of the contents rectangle within each column would wrongly use a WindowPadding.x instead of ItemSpacing.x like it always did. (#125 , #2666 )	2019-07-17 17:29:30 -07:00
omar	61c7f0194e	Misc: Made Button(), ColorButton() not trigger an "edited" event leading to IsItemDeactivatedAfterEdit() returning true. This also effectively make ColorEdit4() not incorrect trigger IsItemDeactivatedAfterEdit() when clicking the color button to open the picker popup. (#1875 ) Demo: Added Button with repeater and InputFloat with +/- button to the status query test demo.	2019-07-17 17:10:28 -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	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	3d07c7cbe4	TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).	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	3436132d4b	Combo: Hide arrow when there's not enough space even for the square button. + Various todo items.	2019-07-11 17:20:56 +02:00
omar	1f54c16f52	Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-02 18:47:10 +02:00
omar	e16564e67a	Scrollbar: Avoid overlapping the opposite side when window (often a child window) is forcibly too small.	2019-07-01 20:59:00 +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	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	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	5ae268c0a3	Internals: Reworked RenderTextEllipsis() to satisfy what we need for table headers.	2019-06-11 16:12:00 +02:00
omar	c3a348aa25	CollapsingHeader: Minor fix to align right side of frames (which is extruded past the Work/Contents rect) with clipping rectangle.	2019-06-11 15:56:57 +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	63310acd58	Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.	2019-06-06 16:16:18 +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	c1a61d25a7	Scrollbar overlap an extra WindowBorderSize amount on the left to make all distances consistent. Reverted to BorderSize not affecting work/contents rectangles. Scrollbar, Style: Changed default style.ScrollbarSize from 16 to 14.	2019-06-05 15:59:14 +02:00
omar	15282261dd	Internals: Minor no-op tidying up toward solving the WindowPadding / WindowBorderSize / ScrollbarSize overlapping mess. + Demo: Use SetScrollY().	2019-06-05 15:59:14 +02:00
omar	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	b9874a2423	Comments about obsoleted features version. Todo. Clarify tab bar initial offset (useful if we decide to remove the half-windowpadding clip margin).	2019-06-05 15:58:49 +02:00
omar	440ad0b440	Merge branch 'master' into docking	2019-06-05 00:37:20 +02:00
DucaRii	6614bab883	Combo: Fixed rounding not applying with the ImGuiComboFlags_NoArrowButton flag. (#2606 , #2607 )	2019-06-04 20:49:29 +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	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	70a4be07df	ColorEdit: Fixed the color picker popup only displaying inputs as HSV instead of showing multiple options. (#2587 , broken in 1.69 by #2384 ).	2019-05-27 14:57:39 +02:00
omar	e5dfa0855f	Docking: Honor style.WindowMenuButtonPosition setting in docking node.	2019-05-24 21:59:44 +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	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	3fda90d6a7	Fixed InputScalar, InputScalarN, SliderScalarN, DragScalarN with non-visible label from inserting style.ItemInnerSpacing.x worth of trailing spacing.	2019-05-24 14:32:28 +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	04022114d9	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-05-21 14:47:29 +02:00
omar	882d2c3aea	Fixed crash when appending with BeginMainMenuBar() more than once and no other window are showing. (#2567 ) + comments	2019-05-21 12:18:34 +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	e6109a9145	Fixed ColorEdit breakage introduced by `d3a387c` (#2557 , #1875 , #2034 )	2019-05-18 11:18:31 +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	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	39eeda0227	Internal: Scrollbar: Further sane simplification (using InnerMainRect instead of duplicating calculations).	2019-05-10 18:52:29 +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	9534ef9b26	Separator: Revert 1.70 "Declare its thickness (1.0f) to the layout" change (`c5d83d8a`). It's not incorrect but it breaks existing some layout patterns. Will return back to it when we expose Separator flags.	2019-05-09 17:52:56 +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	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	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	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	4dec744795	Tidying up BeginMenu() code + comments.	2019-04-29 00:02:02 +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	c5d83d8af2	Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.	2019-04-26 23:31:31 +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	56c3aaf6bd	Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.	2019-04-25 17:50:40 +02:00
omar	dd15b44230	Internals: TempInputText: Tidying up DragScalar / SliderScalar / TempInputTextScalar.	2019-04-25 17:50:40 +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	16b18b265e	MenuItem, BeginMenu: Fix undesirable tall frames in horizontal layout context, which would be visible when trying to use rounded selectable/menus. PushStyleVar: Added comments in the assert message. Minor tweaks.	2019-04-25 11:34:07 +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	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	240dddff87	Combo, Slider: Improve rendering in situation when there's there's very little space available.	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	7baf45cffa	Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.	2019-04-16 22:02:56 +02:00
omar	655ebe4eaf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-04-16 13:14:10 +02:00
omar	311469e9d6	Internals: Columns: Some renaming, extracted code into GetColumnsID().	2019-04-16 11:58:54 +02:00
omar	712203dbcb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-04-13 18:53:00 +02:00
omar	fb2626c21b	Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.	2019-04-13 00:29:27 +02:00
omar	c6f1b7b92a	Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.	2019-04-13 00:27:44 +02:00
omar	30d81f53cb	PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485 )	2019-04-12 22:16:59 +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	b53630813e	Internals: Tweak ItemSize calls. Added todo items.	2019-04-08 16:13:51 +02:00
omar	50ceb25003	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_vulkan.cpp	2019-04-07 16:23:31 +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	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	da035ced97	InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336 , #2467 ) + Fix some output filename in SDL build batch files.	2019-04-03 11:04:00 +02:00
omar	01e29a3933	InputText: Fixed ImGuiInputTextFlags_AllowTabInput leading to two tabs characters being inserted if the back-end provided both Key and Character input. (#2467 , #1336 )	2019-04-03 10:45:51 +02:00
omar	4a57507f75	InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467 , #1336 ) Not using isprint. + todo items.	2019-04-03 10:40:14 +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	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	3d8ea352d1	InputText: Fixed selection background starts rendering one frame after the cursor movement when first transitioning from no-selection to has-selection. (Bug in 1.69) (#2436 ) [@Nazg-Gul]	2019-03-25 16:06:30 +01:00
omar	abb7d7b18a	InputText: Simplify read-only code path.	2019-03-25 15:50:23 +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	a26085ed53	Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211 ) + Examples comments	2019-03-12 22:23:56 +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	99d8425173	TabBar: Fixed Tab tooltip code making drag and drop tooltip disappear during the frame where the drag payload activate a tab.	2019-03-12 18:56:19 +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	495065f790	Fixed Clang and PVS warnings.	2019-03-12 12:08:51 +01:00
omar	f254168335	InputText: Fixed `c779fbb` leading to display of the wrong buffer when resizing a buffer. (#2400 , #2006 , #1443 , #1008 ).	2019-03-12 11:56:40 +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
Haldean Brown	79bb4ce128	Added ImGuiColorEditFlagsFlags_InputHSV. (#2383 , #2384 )	2019-03-08 18:16:41 +01:00
omar	8e0e91827f	ColorEdit: Fixed tooltip not honoring the ImGuiColorEditFlags_NoAlpha contract of never reading the 4th float in the array (value was read and discarded). (#2384 )	2019-03-08 18:16:41 +01:00
omar	d77d3416d3	Merge branch 'master' into docking	2019-03-07 18:40:55 +01:00
omar	e9651aaa77	TabBar: Fixed ImGuiTabItemFlags_SetSelected being ignored if the tab is not visible (with scrolling policy enabled) or if is currently appearing.	2019-03-07 17:45:59 +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
omar	8464df1f6e	Internals: ColorEdit: Minor optimizations. Initialize internal arrays as static const, avoid unnecessary HSV->RGB conversion.	2019-03-06 19:30:34 +01:00
omar	ea8158acdf	Demo: Renamed ShowHelpMarker() -> HelpMarker(). Fixed minor PVS warning. Removed unnecessary casts.	2019-03-06 18:24:07 +01:00
omar	c779fbb651	InputTextWithHint: Fix for Password fields. Update changelog, demo. (#2400 )	2019-03-06 17:33:24 +01:00
Lucas Lazare	ab80ee6453	Added InputTextWithHint() (#2400 ) Squashed commit of the following: commit `1970d84051` 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 `219bdfcb7f` Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 12:17:27 2019 -0500 Removing useless check introduced in b0d172 commit `8afd7a2b45` Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:49:24 2019 -0500 Removing sneaky tabulations commit `8e04908631` Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:45:13 2019 -0500 Moving InputTextHinted code to InputTextEx commit `b0d1723a2f` Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 00:23:02 2019 -0500 C++11 to C++98 commit `9afeae3998` 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	fe48368cb2	InputText: Moving some code in anticipation of supporting hint display with password. This commit is aimed at having no visible side effect. (#2400 )	2019-03-06 15:45:11 +01:00
omar	e02d6014bf	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h	2019-03-05 22:13:38 +01:00
omar	344140004b	Fixed IsItemDeactivated()/IsItemDeactivatedAfterEdit() from not correctly returning true when tabbing out of a focusable widget (Input/Slider/Drag) in most situations. (#2215 , #1875 ) + Minor renaming of a local variable in widget code.	2019-03-05 22:09:25 +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	076be7ec41	MenuItem, Selectable: Fixed disabled widget interfering with navigation (fix `c2db7f63` in 1.67).	2019-03-05 19:00:19 +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	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	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	49eb5f0280	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp	2019-03-03 23:34:56 +01:00
omar	1c67d09c0b	ColorPicker: Fix assertion when running in a collapsed window and dragging its title bar (#2389 )	2019-03-01 00:06:36 +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	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	ac47710db7	Internal: InputText: Tweaks to make PVS static analyzer relax a little with its false positive.	2019-02-27 16:49:55 +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	def723b6b6	Plot: Fixed error in `5e3a1de` (#2387 )	2019-02-27 14:34:11 +01:00
omar	5e3a1de4e6	Plot: Fixed divide-by-zero in PlotLines() when passing a count of 1. (#2387 ) [@Lectem]	2019-02-27 14:25:37 +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	439f726945	InputText; Disabled rendering selection when inactive (it kinda work but I'm not sure this is desirable especially for single-line input, was not intended to be active).	2019-02-24 23:31:00 +01:00
omar	8915f7933a	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-02-24 23:24:07 +01:00
omar	6f80179a1d	InputText: Fixed deactivated but-last-active InputText instance holding on displaying the last active version of the text and not reflecting change in the source. Fix/amend `2e9a175`. [+test]	2019-02-23 17:04:54 +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	9da48c16c5	TabBar: Added extra mis-usage error recovery. Past the assert, common mis-usage don't lead to hard crashes any more, facilitating integration with scripting languages. (#1651 )	2019-02-22 12:27:41 +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	f988618ebe	Internal: InputText: Tweaks (including a large indentation change, compare ignoring space) to make next commit more digestible.	2019-02-21 23:06:26 +01:00
omar	be593f2c16	Internal: InputText: refactor the flow to easily decorrelate rendering of selection vs cursor, which would allow us to render selection on inactive items, and generally makes the code clearer. + Some renaming.	2019-02-21 22:56:09 +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	cc3be5d428	InputText: Fixed an edge case crash that would happen if another widget sharing the same ID is being swapped with an InputText that has yet to be activated.	2019-02-21 19:55:36 +01:00
omar	2e9a175057	Internal: InputText: Refactor to clarify access pattern to the InputTextState (we are now accessing via a pointer which can be NULL, shortened its name while we are at it) + added an assert to track an issue that existed already before.	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	782b747a17	InputText: Renamed some local variables to clarify code. Should be a no-op functionality wise. TODO items.	2019-02-20 00:45:45 +01:00
omar	7c51cba74f	InputInt, InputFloat, InputScalar: Fix to keep the label of the +/- buttons centered when style.FramePadding.x is abnormally larger than style.FramePadding.y. Since the buttons are meant to be square (to align with e.g. color button) we always use FramePadding.y. (#2367 )	2019-02-20 00:20:11 +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	77833003ff	Fixed unused argument warning when compiling with IM_ASERT() evaluating to an empty macro.	2019-02-19 17:32:14 +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	7573d10a4a	Docking: Fixed bad ever-growing/ leak (accumulating text into TabsNames forever, fix `d38f4dc14` from February 5th, affected docking branch only). (#2109 )	2019-02-18 16:50:39 +01:00
omar	09c9bf2edb	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +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	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	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	1b63ded8fa	Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.	2019-02-07 12:07:53 +01:00
omar	4a3a895be9	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	29d38b59d0	ListBox/InputTextMultiline: Better optimized when clipped / non-visible.	2019-02-06 14:46:14 +01:00
omar	62084aac0f	DragScalarN, SliderScalarN, InputScalarN: Removed unnecessary string id after the integer PushID() calls.	2019-02-06 14:39:00 +01:00
omar	f366828dd2	Minor tweaks to reduce false positive of PVS Studio static analyzer.	2019-02-06 13:16:52 +01:00
omar	5bdc7d7a6f	Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. (#1086 )	2019-02-06 12:32:10 +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	cef4e086ba	Internals: Selectable: Fixed rendering width miscalculation when starting pos is not line start pos, which would generally be unnoticeable. Could affect group lock X with a smaller SetCursorPos value but that's unlikely to be used.	2019-02-05 21:17:00 +01:00
omar	521470b3cd	Internals: Removed unnecessary code.	2019-02-05 21:16:32 +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	b980e0077a	Tabs: Moved Tab List Popup to left-side to match docking button. Highlight selected tab. (#261 , #351 )	2019-02-05 13:39:48 +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	f7c879eb60	RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.	2019-02-04 23:34:32 +01:00
omar	0b05ba18df	Internals: DragScalar, SliderScalar: Calling ItemSize before ItemAdd as with every other widgets so we can more easily rearrange the signature of ItemXXX functions (toward allowing non-rounded sizes for scaling and flow layout).	2019-02-04 23:34:27 +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	d5945aa25b	Internals: Minor changes to TreeNodeBehavior() and Selectable() for the benefit of fhe 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	f906d53f7d	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-31 19:19:35 +01:00
omar	dc8ff68871	Docking: VisibleWindow of a node spread its _NoMove attribute to the node (fixed dragging or undocking of dock node host from collapse button). (#2325 , #2109 )	2019-01-31 15:22:40 +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	1fb57c97c6	Internals: InputScalarAsWidgetReplacement: Fixed seemingly unnecessary calling of SetActiveID/SetHoveredID every frame, which in turns allow us to remove the g.ActiveIdAllow/Block settings duplicated.	2019-01-30 15:41:20 +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	158995f271	InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. (#2321 ) [@relick]	2019-01-30 13:15:14 +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	13a5f5ba8b	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	4e8e177cac	Persistently fixing some PVS-Studio static analyzer false positive warnings.	2019-01-27 16:35:48 +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	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	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	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	d1851ed6b7	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]	2019-01-16 16:19:38 +01:00
omar	32c4e01267	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:13:23 +01:00
omar	06aaf23877	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:10:51 +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	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

... 12 13 14 15 16 ...

1510 Commits