imgui

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

Author	SHA1	Message	Date
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
omar	7a5058e3bf	Version 1.67	2019-01-14 17:41:44 +01:00
omar	1da40df279	DragFloat: Fixed broken mouse direction change with power!=1.0. (#2174 , #2206 ) [@Joshhua5]	2019-01-14 17:38:19 +01:00
omar	6e41745f31	Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277 )	2019-01-13 18:57:46 +01:00
omar	8011197c50	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2019-01-10 16:02:32 +01:00
omar	c96aaef132	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2019-01-10 16:01:36 +01:00
omar	1f6e0b2f98	ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal).	2019-01-10 15:51:08 +01:00
omar	61a99f994e	Minot internal tweaks, comments	2019-01-08 23:11:54 +01:00
omar	b33977bc15	Tests: Reworking hook prototypes for imgui-test to be faster and multi-context friendly.	2019-01-07 23:59:05 +01:00
omar	c2db7f63bd	Selectable() should have an ID even though they are disabled, to be consistent with other widgets. Not sure of the reasoning ~1.41 which made this turn to 0.	2019-01-07 23:48:50 +01:00
omar	6b32570644	Merge branch 'viewport' into docking # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-01-07 21:29:15 +01:00
omar	5af930f97a	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-07 21:28:29 +01:00
omar	1ae7f88495	Tabs: Added ImGuiTabBarFlags_NoTooltip flag. (#261 , #351 ) + added helpful assert	2019-01-07 18:07:09 +01:00
omar	acfa4050ec	Tweak changelog + tweak internal render helper functions.	2019-01-07 16:43:55 +01:00
omar	c3af134cc8	IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.	2019-01-06 16:37:42 +01:00
omar	9ba202821f	Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. (#787 )	2019-01-04 19:03:56 +01:00
omar	d223d1e951	Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.	2019-01-04 18:01:43 +01:00
omar	7f7e8eeecd	Docking: Fixed a bug undocking a window from its tab when it is the only docked window of a root dockspace with ConfigDockingTabBarOnSingleWindows enabled.	2019-01-03 22:11:14 +01:00
omar	ce1626a51e	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-02 21:36:21 +01:00
omar	951c9dd68b	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2019-01-02 19:00:31 +01:00
omar	acacd93836	Renamed extra_flags to flags in InputXXX parameters.	2019-01-02 11:08:14 +01:00
omar	c738f9ef92	InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257 )	2019-01-02 11:03:56 +01:00
omar	088ef6623a	Merge branch 'viewport' into docking	2018-12-18 15:03:01 +01:00
omar	9c916cdaf9	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-12-18 15:02:35 +01:00
omar	ae76a1fda7	Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.	2018-12-18 15:01:15 +01:00
omar	ac9512e095	Merge branch 'master' into docking # Conflicts: # imgui.cpp	2018-12-14 18:46:24 +01:00
omar	65dac02171	Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.	2018-12-14 18:44:17 +01:00
omar	f6f5c51106	Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.	2018-12-14 18:42:28 +01:00
omar	587506dd57	Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)	2018-12-14 11:27:02 +01:00
omar	2a1e903f43	Merge branch 'master' into viewport # Conflicts: # imgui.h	2018-12-13 19:20:34 +01:00
omar	991b16cc6a	Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_widgets.cpp	2018-12-11 19:46:46 +01:00
omar	1b263f6ab0	Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261 ) incorrectly missing from the merge from Docking branch.	2018-12-11 19:37:22 +01:00
omar	5a6b8e00db	BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261 )	2018-12-11 15:22:10 +01:00
omar	067b691fd8	Merge branch 'viewport' into docking # Conflicts: # docs/TODO.txt # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_draw.cpp # imgui_internal.h # imgui_widgets.cpp	2018-12-11 13:23:00 +01:00
omar	c40feabe4d	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-11 12:41:40 +01:00
omar	54a60aaa40	Added BETA api for Tab Bar/Tabs widgets. (#261 , #351 ) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature) - Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API. - Added ImGuiTabBarFlags flags for BeginTabBar(). - Added ImGuiTabItemFlags flags for BeginTabItem(). - Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors. - Demo: Added Layout->Tabs demo code. - Demo: Added "Documents" example app showcasing possible use for tabs.	2018-12-11 12:36:47 +01:00
omar	15447f5b7b	Using named flags instead of 0 + shallow formatting tweaks from other branches.	2018-12-11 12:14:27 +01:00
omar	e6439e1a16	Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp	2018-12-10 16:21:49 +01:00
omar	26b9e2d0a5	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_demo.cpp	2018-12-10 16:14:31 +01:00
omar	d20e3ee710	Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.	2018-12-10 14:30:41 +01:00
omar	3a5e758ee3	Tabs: Fixed crash when using TabItem in a regular (non-docking) tab bar. (#2231 )	2018-12-08 12:35:15 +01:00
omar	f768727284	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp	2018-12-06 16:36:17 +01:00
omar	a03846bd9e	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-06 16:33:39 +01:00
omar	125e62491e	Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.	2018-12-04 14:34:49 +01:00
omar	6644f1ff64	Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes). Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those.	2018-12-04 13:37:46 +01:00
omar	5105c6c0d0	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2018-12-04 00:06:26 +01:00
omar	3a678d48b1	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp	2018-12-04 00:05:45 +01:00
omar	8bac6d428d	Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. (#2109 )	2018-12-04 00:01:20 +01:00
omar	10e13dd6bb	Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).	2018-12-03 12:19:23 +01:00
omar	ac10889bde	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt	2018-12-03 11:44:51 +01:00
omar	65e579e558	Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp	2018-12-03 11:41:53 +01:00
omar	801645d350	Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).	2018-12-03 10:17:17 +01:00
omar	f78b5a0cdb	Merge branch 'viewport' into docking	2018-11-30 18:27:14 +01:00
omar	afeefadb4e	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.h	2018-11-30 18:24:43 +01:00
omar	1bfcf8f339	Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file.	2018-11-30 16:42:32 +01:00
omar	3f51c831de	Docking: Added internal DockBuilderGetCentralNode(). Fixed being unable to undock whole node from dock button in DockSpace with a central node. (#2109 )	2018-11-26 22:18:55 +01:00
omar	ddc3f8f069	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h	2018-11-26 15:32:04 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	2515413080	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_widgets.cpp	2018-11-22 15:29:18 +01:00
omar	d87b80c6c1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-11-22 15:28:27 +01:00
omar	da3c4330c1	Version 1.66	2018-11-22 15:11:52 +01:00
omar	4a43f347bb	Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_marmalade/main.cpp	2018-11-15 14:00:01 +01:00
omar	dcbf976a8e	Merge branch 'master' into viewport + comments # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-11-15 13:58:46 +01:00
omar	f2d577c33f	Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.	2018-11-13 22:14:40 +01:00
omar	ae34241f8b	Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.	2018-11-13 22:11:39 +01:00
omar	6c1ae6cc71	Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).	2018-11-09 14:41:40 +01:00
omar	6d7677534f	Internals: SliderBehavior: Using axis indexing.	2018-11-09 14:31:14 +01:00
omar	565af90958	Merge branch 'viewport' into docking	2018-11-06 09:52:38 +01:00
omar	52ca91ca57	Merge branch 'master' into viewport	2018-11-05 17:29:31 +01:00
omar	eb592bf7d3	ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. (#2173 ). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.	2018-11-05 14:49:17 +01:00
omar	7fa3e71abb	Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155 )	2018-10-30 10:48:21 +01:00
omar	168af9b377	Merge branch 'viewport' into docking # Conflicts: # imgui_demo.cpp	2018-10-25 23:45:19 +02:00
omar	1a6eea012d	Docking: Tweaked tooltip on tabs so they don't show immediately when holding and releasing a tab (using HoveredIdNotActiveTimer) + Minor refactor + Removed legacy .ini parsing.	2018-10-25 23:41:32 +02:00
omar	50f6e12d31	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-10-25 23:41:13 +02:00
Konstantin Podsvirov	faecf90383	SliderAngle: Added optional `format` argument to allow users customize precision and make localization. (#2150 )	2018-10-25 22:29:29 +02:00
omar	5f8c9ae0ef	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:57:54 +02:00
omar	056af2b1af	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:56:26 +02:00
omar	31fd6c585a	Removed unnecessary ImGui:: qualifiers in internal code.	2018-10-17 10:47:27 +02:00
omar	e6cc547a94	Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_widgets.cpp	2018-10-12 15:51:31 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	ca753829cb	Revert using wchar_t functions (`9cf94d5` + `2eaf5b0`). Big mistake, wchar_t is not guaranteed to be 16-bits.	2018-10-12 15:48:38 +02:00
omar	2eaf5b03df	Fixes crash introduced in previous commit `9cf94d5`.	2018-10-12 13:30:00 +02:00
omar	ede3a3b92d	Fixes crash introduced in previous commit `9cf94d5`.	2018-10-12 13:29:13 +02:00
omar	c398153b40	Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h	2018-10-12 13:01:20 +02:00
omar	9cf94d5dd6	RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.	2018-10-12 12:34:47 +02:00
omar	0fe48cbb61	Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035 , #2096 ) Added misc/README file.	2018-10-12 11:16:51 +02:00
omar	cf0afb48ac	TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments. Internals: Added ImStreolRange() + used in LogRenderedText() + comments.	2018-10-11 12:53:10 +02:00
omar	059560d28b	ButtonBehavior, ImGuiButtonFlags_FlattenChildren flag can be used from a child window. Would typically affect calling SplitterBehavior() from a child window.	2018-10-03 18:11:35 +02:00
omar	2cff3f6a65	Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.	2018-10-01 18:35:21 +02:00
omar	ed3c015f4e	Docking: Reorganizing some of the tab-bar selection and window focus related code.	2018-09-30 23:39:38 +02:00
omar	35d1fb7b34	Style: Added style.TabRounding setting.	2018-09-30 18:41:07 +02:00
omar	c6193d0605	Merge branch 'viewport' into docking	2018-09-26 21:35:09 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	4053d9d638	Docking: Fixed tab order restoring (follow up to `67be485e`, broken in `455dc6e2`)	2018-09-26 17:11:37 +02:00
omar	9960ccddb2	Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.	2018-09-24 23:19:18 +02:00
omar	fa0ce4b7d5	Docking: Some DockBuilder functions are applied on settings data if windows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)	2018-09-24 16:38:44 +02:00
omar	599d5f185c	TabBar: Recover if SelectedTabId doesn't exist anymore.	2018-09-21 11:02:03 +02:00
omar	3d318a6577	ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different. Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.	2018-09-20 10:24:29 +02:00
omar	e647f89c33	Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!	2018-09-19 22:38:40 +02:00
omar	455dc6e229	Docking: Creating tab bar and adding window into tab bar immediately (not sure why I didn't do that before). Probably broke something subtle, will find out. Edit Initially broke restoring selected tab.	2018-09-19 16:00:13 +02:00
omar	35032d41fa	Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext	2018-09-17 17:06:52 +02:00
omar	e32256b4b4	Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui_demo.cpp # imgui_internal.h	2018-09-14 11:38:10 +02:00
omar	b85f345369	Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp	2018-09-14 11:32:55 +02:00
omar	c12da2a607	BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.	2018-09-14 11:28:08 +02:00
omar	ca5dc0c019	ColorPicker: Replaced the Separator with a Spacing call. (#2068 )	2018-09-14 10:05:53 +02:00
Elias Daler	ec04e8bb05	Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton (#2080 )	2018-09-12 22:58:45 +02:00
omar	9cc63ba279	Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078 )	2018-09-11 22:00:57 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	d014d0285a	DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. (#2024 )	2018-09-11 11:15:06 +02:00
omar	af6cf25255	DragFloat: Fixed a situation where dragging with value rounding enabled or with a power curve erroneously wrapped the value to one of the min/max edge. (#2024 , #708 , #320 , #2075 ).	2018-09-11 10:55:52 +02:00
omar	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	d5692bff00	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:30:14 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
omar	a82be53407	Merge branch 'docking2' into viewport_docking # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2018-09-06 22:28:21 +02:00
omar	bd5b38e232	Docking: Added Docking system. Enable with io.ConfigFlags \|= ImGuiConfigFlags_DockingEnable. (Part 1) (#351 )	2018-09-06 21:45:46 +02:00
omar	58d46e1fe6	Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261 , #351 )	2018-09-06 21:45:44 +02:00
omar	eb7033e75b	Version 1.66 WIP	2018-09-06 21:44:59 +02:00
omar	b974fffea0	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-09-06 15:59:35 +02:00
omar	e0cab5664a	Version 1.65	2018-09-06 15:58:58 +02:00
omar	5a679a45cc	Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718 , #2036 ) If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths. The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.	2018-09-06 15:58:25 +02:00
omar	a2616c79fe	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-09-06 11:42:11 +02:00
omar	e58bc3d5b7	Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036 )	2018-09-06 11:36:00 +02:00
omar	31b5b18611	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-09-05 20:59:27 +02:00
omar	bb3184af74	Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) (#2036 )	2018-09-05 20:54:28 +02:00
omar	af27ec296b	Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags # Conflicts: # imgui.cpp # imgui.h	2018-09-05 17:38:47 +02:00
omar	77ba883f23	Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427 ) + changed ImGuiIO layout.	2018-09-05 17:29:47 +02:00
omar	b944aa623c	Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'	2018-09-05 11:52:48 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
omar	d07f494305	Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. (#2036 ) Renamed RoundScalarWithFormat -> RoundScalarWithFormatT. Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT	2018-09-03 14:49:13 +02:00
omar	bcb1441ce7	Version 1.65 WIP	2018-09-03 14:38:04 +02:00
omar	fd201a90f1	Merge branch 'master' into viewport # Conflicts: # imgui.cpp	2018-08-31 18:39:02 +02:00
omar	767649afb1	Fix missing include on some systems to use intptr_t. (#2036 , #2054 )	2018-08-31 18:07:47 +02:00
omar	0c24fe276c	Merge branch 'master_164' into viewport_164 # Conflicts: # imgui.cpp # imgui_draw.cpp # imgui_widgets.cpp	2018-08-31 10:28:21 +02:00
omar	48db5713d6	Version 1.64	2018-08-31 10:00:03 +02:00
omar	38cfcf9fbc	Tweak comments and indexes	2018-08-31 09:59:58 +02:00
omar	a58e4dfd0f	Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036 )	2018-08-30 21:16:23 +02:00
omar	df37a156e8	Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036 )	2018-08-30 20:51:57 +02:00
omar	d4e49a2697	Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164 # Conflicts: # imgui.cpp # imgui_widgets.cpp	2018-08-30 19:29:46 +02:00
omar	521405488b	Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:21:50 +02:00
omar	24dfa0c957	Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:12:33 +02:00
omar	158a65c98f	Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:04:49 +02:00
omar	6caf074bd5	Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:04:42 +02:00
omar	905e14f384	Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:04:36 +02:00
omar	4be79a8955	Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:04:04 +02:00
omar	2d952504ed	Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:01:05 +02:00
omar	43219d36a6	Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:00:59 +02:00
omar	99b27488e7	Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 19:00:52 +02:00
omar	18972c5513	Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036 )	2018-08-30 19:00:42 +02:00
omar	e312363007	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036 )	2018-08-30 19:00:33 +02:00
omar	2714f8fa23	Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:46 +02:00
omar	c25f48b902	Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:46 +02:00
omar	ad0bfdcd95	Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:45 +02:00
omar	5dc954f5d7	Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:45 +02:00
omar	a265c62636	Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:45 +02:00
omar	0e9577d0da	Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 15:40:44 +02:00
omar	f26b8c1e07	Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 14:55:27 +02:00
omar	6468a3c0ce	Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 14:50:32 +02:00
omar	3eaa063984	Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp (#2036 )	2018-08-30 14:50:32 +02:00
omar	52c115fb2c	Refactor: Added imgui_widgets.cpp headers to easily merge in the functions in all our branches. (#2036 )	2018-08-30 14:50:32 +02:00
omar	01586d33f3	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036 )	2018-08-30 14:29:11 +02:00

... 19 20 21 22 23 ...

1598 Commits