4163 Commits

Author	SHA1	Message	Date
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	28953208d4	Tests: Added imgui-test engine hooks (experimental).	2018-10-12 15:47:15 +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	33994bbfa1	Docking: Fixed Modal window from being dockable.	2018-10-12 12:56:56 +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	ed4dcd9072	Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()	2018-10-11 22:38:26 +02:00
omar	7525637804	Merge branch 'viewport' into docking. 15ec78e Fixes the update of title buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate(). ... # Conflicts: # imgui.cpp	2018-10-11 21:36:00 +02:00
omar	15ec78e9d8	Internal: Moved stored window name update code to the first_begin_of_the_frame block. This will be useful in the Docking branch.	2018-10-11 21:32:20 +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	d02b11dfbd	ImGuiTextBuffer: Avoid heap allocation when empty.	2018-10-11 12:08:09 +02:00
omar	1efafa1d29	Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)	2018-10-10 12:09:06 +02:00
omar	3a7828de6b	Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)	2018-10-09 18:35:45 +02:00
omar	7b3433c68b	Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)	2018-10-09 18:33:39 +02:00
omar	84507cc744	Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)	2018-10-08 12:37:10 +02:00
omar	cb76c086e0	Docking: Removed context parameter from internal DockBuilderXXX api at it is expected we transition it to be public facing. (#2109)	2018-10-05 16:14:51 +02:00
omar	4e30698706	Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)	2018-10-03 22:32:23 +02:00
omar	2dd8338e7d	Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109)	2018-10-03 18:30:36 +02:00
omar	d348d86df4	Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)	2018-10-03 17:50:07 +02:00
omar	1d3862b6b3	Docking: Added ImGuiDockNodeFlags_NoDockingInsideDocRootNode flag. Honoring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. (#2109)	2018-10-03 14:57:28 +02:00
omar	bd82539ad5	Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)	2018-10-03 14:42:47 +02:00
omar	83f55c9de5	Merge branch 'viewport' into docking	2018-10-02 18:55:48 +02:00
omar	33b88a0339	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-10-02 18:55:36 +02:00
omar	fbfe193fcd	Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. (#2110)	2018-10-02 18:49:55 +02:00
omar	ae7f833c69	Window: Resizing from edges (with io.ConfigResizeWindowsFromEdges Beta flag) extends the hit region of root floating windows outside the window, making it easier to resize windows. Resize grips are also extended accordingly so there are no discontinuity when hovering between borders and corners. (#1495, #822, #2110)	2018-10-02 18:43:10 +02:00
omar	44bfa24cc3	Docking: Fixed crash using DockBuilderSplitNode(). (#2109)	2018-10-02 11:09:53 +02:00
omar	2cff3f6a65	Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.	2018-10-01 18:35:21 +02:00
omar	e623be998d	Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143)	2018-10-01 15:53:18 +02:00
omar	b48ed9ebc0	Docking: Better tracking of current dock id for inactive and uncreated windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another	2018-10-01 11:56:26 +02:00
omar	4e717b524c	Docking: Fixes for C++03 compilers.	2018-10-01 10:40:43 +02:00
omar	ae657a349a	Docking: Fixed extracting a dock node from a document root: document root should be preserved.	2018-09-30 23:39:38 +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	9cfc40c2cc	Docking: Demo: Displaying a message if master docking flag is disabled. + DockSpace() early out + comments.	2018-09-30 23:39:37 +02:00
omar	6ebc63d3ef	Docking: Various sanity fixes + fixed tab-bar items sorting issue when docking single window with a dock node into single window without dock node.	2018-09-30 22:07:57 +02:00
omar	1ae0a1e658	Docking: Fix DockContextRebuild() temporarily invalidating dockid reference leading to undesirable merging of nodes.	2018-09-30 19:34:03 +02:00
omar	46dff42239	Docking: Fixed dock node with single window accidental stealing of non-owned host viewport (leading to general havoc).	2018-09-30 19:30:51 +02:00
omar	35d1fb7b34	Style: Added style.TabRounding setting.	2018-09-30 18:41:07 +02:00
omar	876a3299fc	Docking: Added DockBuilderCopyDockspace() wip. Added DockBuilderCopyWindowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().	2018-09-28 17:58:55 +02:00
omar	3dcd552628	Fixed extraneous static attribute. (#2105)	2018-09-27 13:01:51 +02:00
Loïc HAMOT	9aae21483a	Fix missing IMGUI_API and mismatching namespace internal's CreateNewWindowSettings (#2105)	2018-09-27 12:59:22 +02:00
omar	93896d550e	Added FindOrCreateWindowSettings() internal helper.	2018-09-26 23:01:51 +02:00
omar	18ffb7dd86	Docking: Reworked DockContextPruneUnusedSettingsNodes() to prune entire unused trees.	2018-09-26 23:01:51 +02:00
omar	c6193d0605	Merge branch 'viewport' into docking	2018-09-26 21:35:09 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	61d94ff88e	Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).	2018-09-26 21:30:37 +02:00
omar	a7d3ae8937	BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698, #894, #713) + reworked the Begin/BeginChild comments in imgui.h.	2018-09-26 21:24:42 +02:00
omar	4053d9d638	Docking: Fixed tab order restoring (follow up to 67be485e, broken in 455dc6e2)	2018-09-26 17:11:37 +02:00
omar	45731cca19	Docking: Added DockBuilderForkNode() primitive for usage for user code to fork/copy entire layouts. This will probably need to be added to as I find ways to migrate patterns from user code to the library. Added IMGUI_DEBUG_DOCKING_INI helper to facilitate debugging. (+1 squashed commits)	2018-09-26 17:11:37 +02:00
omar	dc92431328	Docking: Minor renaming. DockContextAddNode() uses 0 as marker for automatic ID selection + TODO update and moved docking entries to docs/TODO.txt	2018-09-26 12:58:14 +02:00
omar	d3e8e5731a	Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().	2018-09-25 17:45:06 +02:00
omar	53a5d32df1	Docking: Reworked SetNextWindowUserType() as SetNextWindowDockFamily(), allowing multiple scene to be tagged with their scene id and not receive tabs from other scene + persistent storage for family id to allow for docking tree fork/remap.	2018-09-25 16:15:25 +02:00
omar	85e1e2b0c8	Docking: Added DockBuilderGetNode() wrapper for consistency.	2018-09-25 14:14:07 +02:00
omar	9960ccddb2	Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.	2018-09-24 23:19:18 +02:00
omar	4021776d0f	Docking: Fix for undocking node where the dockspace node is attached to an immovable parent window. + Tweak .ini output.	2018-09-24 22:14:12 +02:00
omar	fa0ce4b7d5	Docking: Some DockBuilder functions are applied on settings data if windows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)	2018-09-24 16:38:44 +02:00
omar	2a5ce1849a	Docking, Viewport: Reworked viewport inheritance/transition so that extracting a dock node from a split node owning its viewport will have both viewports be in the expected OS z-order. (The lower window re-use the exiting viewport, the detached node uses a new viewport:	2018-09-24 10:53:51 +02:00
omar	ae4b838840	Docking, Viewport: Rework ownership transfer/stealing to fix issues where non-child windows could be stick marked as not owning their viewport.	2018-09-24 10:48:56 +02:00
omar	79c075ca09	Docking+Viewport: Fixed PlatformRequestClose (e.g. ALT-F4) being redrected to the first window of the docking node instead of the selected one.	2018-09-24 10:48:55 +02:00
omar	1127804109	Viewport: Misc tweaks.	2018-09-24 10:39:15 +02:00
omar	67be485e24	Docking: Fixed losing tab bar selection when extracting a whole docked node + reusing existing dock node when possible.	2018-09-21 16:23:00 +02:00
omar	fda57f48d5	Merge branch 'viewport' into docking ... # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp	2018-09-21 11:52:32 +02:00
omar	840652830d	Docking: Fixed undocking on whole dock node from leaving undesirable empty node in the docking tree. Fixed calls to MarkIniSettingsDirty().	2018-09-21 11:50:49 +02:00
omar	5eabf44021	Nav: Use Platform_SetWindowFocus when CTRL+Tabbing to another viewport.	2018-09-21 11:49:43 +02:00
omar	599d5f185c	TabBar: Recover if SelectedTabId doesn't exist anymore.	2018-09-21 11:02:03 +02:00
omar	3e47978a80	Docking: Renamed ImGuiDockSpaceFlags to ImGuiDockNodeFlags. Clarified in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.	2018-09-20 09:52:51 +02:00
omar	e647f89c33	Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!	2018-09-19 22:38:40 +02:00
omar	82978fc88f	Docking: Fix of title bar flicker during rebuild. Fixed dragging of DockNode always triggering BeginAsDockableDragDropSource() when io.ConfigDockingWithKeyMod is false.	2018-09-19 19:41:31 +02:00
omar	95d49c3b98	Docking: Internals renaming LastExplicitSize to SizeRef (invalidate .ini data) + todo	2018-09-19 18:25:26 +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	291bfe6841	Docking: work to allow programmatic control of dock nodes, various refactor + assert fix. Probably broke something (but I haven't found what yet!)	2018-09-19 16:00:13 +02:00
omar	35032d41fa	Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext	2018-09-17 17:06:52 +02:00
omar	28094b7cea	Docking: Fixed central docking display with ImGuiDockSpaceFlags_NoSplit, affecting in particular with io.ConfigDockingWithKeyMod = false. + comments, asserts	2018-09-17 15:39:35 +02:00
omar	b55b9aee9b	Fixed bad merge (a82be53) where we lost the version number in Docking branch + moved Docking related API together for now.	2018-09-14 18:09:46 +02:00
omar	0f1c21a6c9	Docking: Changed DockSpace() signature to take an ID, as ID will frequently be used by other API it makes more sense to let the user compute it.	2018-09-14 18:09:04 +02:00
omar	175bab4f5f	Docking: Removed SplitRatio from ImGuiDockNode and ImGuiDockNodeSettings, which we don't need anymore.	2018-09-14 17:51:30 +02:00
omar	ba7b68798d	Docking: Misc rework/rename toward being able to rebuild a branch selectively, so we can honor settings changes on a per Dockspace basis. + Comments	2018-09-14 16:01:47 +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	132d8c5a99	Viewport: Increased threshold for setting ImGuiViewportFlags_NoFocusOnAppearing. (#1542), 2 doesn't seem enough with some docking setup.	2018-09-14 11:37:17 +02:00
omar	85a3fb3bef	Viewport: Fix an issue introduced on ~August 16, which would assert when viewport are disabled. Also made the DestroyPlatformWindow process more sturdy. (#1542)	2018-09-13 17:11:06 +02:00
omar	6d91055462	Docking: Fixed floating->docking transition on a platform window mistakenly destroying the platform window because the upcoming tab isn't visible and triggers viewport GC. Fixed missing title bar data on recreate window.	2018-09-13 16:56:57 +02:00
omar	136fc56af0	Docking: Better handling of window losing its dock node or having its dock node not active.	2018-09-13 14:38:37 +02:00
omar	c355ed1267	Docking: Flicker fix when clicking on a Tab leading of a new window, in particular would be noticeable when using nested tab bars.	2018-09-13 12:44:29 +02:00
omar	1cefc48f13	Docking: Internal renaming and comments. + Fixed DockNodeMoveChildNodes() to transfer the LastExplicitSize value (was inconsequential afaik).	2018-09-11 18:53:08 +02:00
omar	211a9c8fd2	Docking: Added ImGuiDockSpaceFlags_KeepAliveOnly, important for multiple level of tabs. (also renamed ImGuiDockFlags to ImGuiDockSpaceFlags.)	2018-09-11 17:58:09 +02:00
omar	f29b3b4033	Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)	2018-09-11 15:35:53 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	c4e26f4b92	Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)	2018-09-10 22:19:54 +02:00
omar	416918429d	Docking: Added Type enum in ImGuiDockRequest. Renamed fields. DockSpace() skips node update if already submitted (when transitioning from implicit -> explicit DockSpace).	2018-09-10 22:09:43 +02:00
omar	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	d5692bff00	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:30:14 +02:00
omar	dcef0c0237	Docking: Updating LastFrameActive earlier in Begin() because BeginDocked() will need to use it. Extracted some code into a DockNodeIsDropAllowedOne() function. Comments.	2018-09-10 20:23:03 +02:00
omar	a68c98bb67	Docking: Added SetNextWindowUserType() + user type filtering in dockspace and window merging. Added DockSpace() flag ImGuiDockFlags_NoSplit. Renaming. Reworked the DockNodeUpdateFindOnlyNodeWithWindows code so DockNodeUpdate can access the first window.	2018-09-10 14:32:00 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
omar	062b1f0463	Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. (#2067)	2018-09-07 22:30:46 +02:00
omar	2eaf722fd7	Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. (#2066)	2018-09-07 17:24:56 +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	e381f22ac1	Docking: Added Docking system. (Part 3) (#351)	2018-09-06 21:45:46 +02:00
omar	9ac1e93aa1	Docking: Added Docking system. (Part 2) (#351)	2018-09-06 21:45:46 +02:00
omar	5adcb9ce6d	Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).	2018-09-06 21:45:45 +02:00
omar	2ec135c9f7	Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.	2018-09-06 21:45:45 +02:00
omar	58d46e1fe6	Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261, #351)	2018-09-06 21:45:44 +02:00
omar	741bdf151a	Added ImGuiWindowFlags_UnsavedDocument flags.	2018-09-06 21:45:10 +02:00
omar	5070c769b8	Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)	2018-09-06 21:45:09 +02:00
omar	52e0de84a9	Internals: Split RenderTextClipped into two functions.	2018-09-06 21:45:09 +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	0b18c11440	Refactor: Moved ImFile functions. (#2036)	2018-09-06 11:36:00 +02:00
omar	ab64e8f993	Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. (#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	cbdce80837	Internals: Refactor: Moved render functions to their own section. (#2036)	2018-09-05 20:46:57 +02:00
omar	8601c39571	Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)	2018-09-05 17:50:55 +02:00
omar	af27ec296b	Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags ... # Conflicts: # imgui.cpp # imgui.h	2018-09-05 17:38:47 +02:00
omar	65876f348a	Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787)	2018-09-05 17:33:00 +02:00
omar	77ba883f23	Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.	2018-09-05 17:29:47 +02:00
omar	bbcc976739	Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.	2018-09-05 17:29:47 +02:00
omar	b944aa623c	Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'	2018-09-05 11:52:48 +02:00
omar	a848807847	Minor inconsequential merges from Master/Docking branches	2018-09-05 11:51:45 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
omar	897e5c6231	Viewport: Moved code following refactor. (#2036, #1542)	2018-09-05 11:08:44 +02:00
omar	40db2ca098	Fixed a build issue with non-Cygwin GCC under Windows.	2018-09-04 18:58:20 +02:00
omar	1007873d94	Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.	2018-09-03 19:51:22 +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	5d40d295b3	Comments, readme updates	2018-08-31 11:37:14 +02:00
omar	fd90afef43	Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) (#2036, #1542)	2018-08-31 11:11:18 +02:00
omar	5207afa0dd	Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) (#2036, #1542)	2018-08-31 11:06:21 +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	c83391262e	Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)	2018-08-30 21:21:14 +02:00
omar	00262d51ad	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)	2018-08-30 21:19:30 +02:00
omar	d7c04ccbfb	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)	2018-08-30 21:18:16 +02:00
omar	b1f263b34b	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)	2018-08-30 21:16:30 +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	8a216fe756	Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. (#2036)	2018-08-30 21:15:12 +02:00
omar	fd2bfb7e07	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) (#2036)	2018-08-30 21:00:51 +02:00
omar	064b949bc2	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) (#2036)	2018-08-30 20:59:24 +02:00
omar	2a0d26e603	Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) (#2036)	2018-08-30 20:58:36 +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	346f83e014	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)	2018-08-30 19:41:02 +02:00
omar	fefcc77f13	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)	2018-08-30 19:40:40 +02:00
omar	b6cdfef442	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)	2018-08-30 19:38:44 +02:00
omar	172e426ba9	Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)	2018-08-30 19:36:59 +02:00
omar	f74d9ec7f7	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)	2018-08-30 19:36:40 +02:00
omar	9093166eea	Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)	2018-08-30 19:35:19 +02:00
omar	f5ed5478e1	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)	2018-08-30 19:35:12 +02:00
omar	9a4234ea8e	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)	2018-08-30 19:35:06 +02:00
omar	af002dc861	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)	2018-08-30 19:34:48 +02:00
omar	adeb993122	Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)	2018-08-30 19:33:02 +02:00
omar	81bc4265e5	Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)	2018-08-30 19:32:52 +02:00
omar	a44c5f7afe	Refactor: Internals: Moved various functions in imgui.cpp (#2036)	2018-08-30 19:30:17 +02:00
omar	728b2ef026	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	cda45737ab	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	acf3cc4c3f	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	8a6fd237f6	Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	84eb2682b7	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	73052dc00c	Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	6bda59e5b7	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) (#2036, #787)	2018-08-30 19:23:11 +02:00
omar	60ee4de56d	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) (#2036, #787)	2018-08-30 19:23:10 +02:00
omar	ce58795bdf	Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) (#2036, #787)	2018-08-30 19:23:10 +02:00
omar	f2926f910f	Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. (#2036)	2018-08-30 19:23:10 +02:00
omar	15172f0742	Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. (#2036)	2018-08-30 19:23:10 +02:00
omar	98f618ed18	Refactor: Internals: Moved various functions in imgui.cpp (#2036)	2018-08-30 19:23:10 +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	6c34bffbb5	Version 1.64 WIP	2018-08-30 19:00:22 +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	f2aa124eb8	Version 1.64 WIP	2018-08-30 14:25:23 +02:00
omar	36b2f64051	Merge branch 'master' into viewport ... # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	2018-08-29 17:40:52 +02:00
omar	9e0f24dcb6	Version 1.63	2018-08-29 16:20:25 +02:00
omar	92edb7a4e3	Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)	2018-08-29 16:12:54 +02:00
omar	2598d26c73	ColorEdit4: Fixed a bug when text input or drag and drop leading to unsaturated HSL values would erroneously alter the resulting color. (#2050)	2018-08-29 13:30:46 +02:00
omar	f9634feb66	Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR (#846)	2018-08-28 19:10:59 +02:00
omar	f81caac459	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-08-25 21:19:42 +02:00
omar	e9c849884a	Viewport: Fixed warnings due to bad merge.	2018-08-24 15:42:31 +02:00
omar	06e917f135	Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. (#2034, #820, #956, #1875)	2018-08-23 13:47:37 +02:00
omar	0810d57819	Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). (#820, #956, #1875, #2034)	2018-08-23 13:26:14 +02:00
omar	e28b1078f5	Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. (#2034)	2018-08-23 13:21:01 +02:00
omar	abaa274592	Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. (#2034)	2018-08-22 22:31:51 +02:00
omar	102d5e6de6	Rearrange header comments to find enums easily + fixed inconsistent sorting.	2018-08-22 22:13:05 +02:00
omar	a4191857c1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_vulkan.h # imgui.cpp	2018-08-22 21:35:44 +02:00
omar	7011d87bf8	InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. (#2006, #1443, #1008)	2018-08-22 21:27:27 +02:00
omar	7d9d9bc34e	InputText: Fix ResizeCallback callback on restoring initial value with Escape key. Avoid over-allocating for InitialText storage. (#2006, #1443, #1008)	2018-08-22 21:11:55 +02:00
omar	ea9f5d7600	Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). (#2035, #2006, #1443, #1008)	2018-08-22 13:25:08 +02:00
omar	8d639ec60d	InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008).	2018-08-22 13:09:44 +02:00
omar	ea1906004b	InputText: Fixed a few pathological crash cases on single-line InputText widget with multiple millions characters worth of contents. Because the current text drawing function reserve for a worst-case amount of vertices and how we handle horizontal clipping, we currently just avoid displaying those single-line widgets when they are over a threshold of 2 millions characters, until a better solution is found.	2018-08-22 12:46:47 +02:00
omar	5122c76441	InputText: Fixed not tracking the cursor horizontally When modifying the text buffer through a callback.	2018-08-22 12:46:47 +02:00
omar	68448c5faa	ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.	2018-08-22 12:46:47 +02:00
omar	2dc5ec95d7	Internals: InputText: Renaming. Comments.	2018-08-22 12:46:46 +02:00
omar	9f393c38e9	InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).	2018-08-22 12:46:45 +02:00
omar	24ff259816	InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008).	2018-08-21 21:36:07 +02:00
omar	4de6e1f7e4	InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.	2018-08-21 15:14:10 +02:00
omar	0fd6e9bc0d	InputText: Fixed minor off-by-one issue when submitting a buffer size smaller than the initial zero-terminated buffer contents.	2018-08-21 14:27:57 +02:00
omar	e6c78f9470	InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) (#211)	2018-08-21 14:27:57 +02:00
omar	5942c08143	Added IMGUI_VERSION_NUM for easy compile-time testing. (#2025)	2018-08-21 14:27:57 +02:00
omar	f23d29b481	Added links to Discourse forums.	2018-08-20 10:45:10 +02:00
omar	4910629f6a	Internals: Moved code out of SliderBehaviorT to reduce code bloat and also because caller may have use for the grab_bb for styling purposes.	2018-08-20 09:59:51 +02:00
omar	9d7480774f	Merge branch 'master' into viewport	2018-08-17 11:37:03 -07:00
omar	bb2de30e3e	Internals: Added ImTextCountUtf8BytesFromChar() helper.	2018-08-17 11:33:45 -07:00
omar	ac39c4b2a8	SplitterBehavior: Fix for when the sizes are already under the minimum desired size.	2018-08-17 11:33:40 -07:00
omar	341ebd961b	Fixed assertion when transitioning from an active ID to another within a group, affecting ColorPicker (broken in 1.62). Made ActiveIdIsAlive track the actual ID to avoid incorrect polling in BeginGroup/EndGroup when the ID changes within the group. (#2023, #820, #956, #1875).	2018-08-16 13:33:16 -07:00
omar	8972ebae73	Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. (#1565, #1599, #586)	2018-08-15 16:28:39 -07:00
omar	5d630c930d	Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542)	2018-08-15 16:15:44 -07:00
omar	9852649e97	Viewport: Initial viewport DpiScale only queried on viewport creation. Because AddUpdateViewport() is called repeatedly on MovingWindow or with ImGuiConfigFlags_ViewportsNoMerge, the DpiScale update would break ImGuiConfigFlags_DpiEnableScaleViewports. (#1542)	2018-08-14 19:17:33 -07:00
omar	1722a31155	Viewport: ImGuiWindowFlags_NoFocusOnAppearing affects viewport accordingly. (#1542)	2018-08-14 14:58:19 -07:00
omar	e5f2295398	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-08-13 17:50:48 -07:00
omar	caaa746424	Nav: NavWindowingList doesn't save to .ini file. TODO entries.	2018-08-13 17:29:20 -07:00
omar	fda9dc8e18	Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. (#2013)	2018-08-09 18:07:49 +02:00
omar	421dc19798	Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015)	2018-08-09 17:49:48 +02:00
omar	d5793102db	imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873)	2018-08-09 17:42:53 +02:00
omar	0065fe16a2	Nav: Made CTRL+TAB skip menus + skip the current navigation window if is has the ImGuiWindow_NoNavFocus set. (#787) ... While it was previously possible, you won't be able to CTRL-TAB out and immediately back in a window with the ImGuiWindow_NoNavFocus flag.	2018-08-08 16:03:13 +02:00
omar	9d8a0374d3	Use literals in place of LLONG_MIN, LLONG_MAX ULLONG_MAX if they are not available. Amend 498c0dcb4c. We prefer using the defines if available in limits.h because they somehow tend to work without warnings when enabling strict C++03 compilation. The 3 literals are fallbacks.. (#1926).	2018-08-06 13:07:19 +02:00
omar	0905202f44	Internals: Minor renaming for consistency.	2018-08-05 18:13:24 +02:00
omar	bc6ac8b2ae	Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame. ... Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.	2018-08-03 18:12:36 +02:00
omar	498c0dcb4c	Using limits.h LLONG_MIN etc. to increase old-compiler compatibility (as ll and ull prefixes were not standard). Not tested much on old compilers, relying on Clang/GCC warnings.	2018-08-03 11:41:07 +02:00
omar	8ef0ca9765	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-08-01 12:27:56 +02:00
omar	87e2fea09d	Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650) ... Demo: Exposed flags in Demo.	2018-08-01 11:50:57 +02:00
omar	65b46f62ef	Fixed PushID() from keeping alive the new ID Stack top value (if a previously active widget shared the ID it would be erroneously kept alive) (drag and drop demo could soft-lock the UI until pressing Escape!)	2018-07-31 17:28:18 +02:00
omar	7e1678ff00	Drag and Drop: Elapse payload as soon as delivery is made. (#153)	2018-07-31 17:28:08 +02:00
omar	c031ea088a	Viewport: Fixed an assert on loss of valid mouse position while dragging a tooltip (would happen often when using debugger breakpoint). Not totally sure about best solution, may not be important.	2018-07-31 13:46:37 +02:00
omar	faf2c34149	Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. (#1725, #143).	2018-07-31 13:46:19 +02:00
omar	79ae6d3bf6	Drag and Drop: Clear payload buffers more consistently in ClearDragAndDrop() + BeginDragDropTargetCustom() can't succeed with hidden contents. (#143)	2018-07-31 13:45:25 +02:00
omar	9824bf1ba1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2018-07-31 12:12:56 +02:00
omar	e13e5982ff	Drag and Drop: Payload stays available and under the mouse if the source stops being submitted, however the tooltip is replaced by "..." + moved FrameScopeActive = false at the bottom of EndFrame() for safety. (#1725)	2018-07-31 12:11:18 +02:00
omar	f88bf9cea3	InvisibleButton: Added an assert to catch common type of passing zero-sized dimensions. (#1983)	2018-07-30 18:48:10 +02:00
omar	a7ac9e8346	Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. (#1987)	2018-07-30 18:20:25 +02:00
omar	4d5dcdb57a	Internals: Changed signature of ShadeVerts functions to remove pointers. (#1286, #1700, #1986)	2018-07-30 17:24:04 +02:00
omar	f05aede098	Revert "Assert that fmt != NULL before calling vsnprintf (#1969)" ... This reverts commit 84183f5bb6.	2018-07-30 16:50:47 +02:00
omar	80db2383d8	Speculative va_copy() fix for old versions of GCC/Clang. (cannot repro) (#1085)	2018-07-30 16:01:06 +02:00
omar	2a67aeaa3d	Visual Studio: calling into _vsnprintf. (#1085)	2018-07-30 16:01:06 +02:00
omar	15a93d6fe3	Internals: Fixed HoveredIdTimer so it is safe to call SetHoveredId() multiple times without altering the timer.	2018-07-30 14:36:33 +02:00
omar	f9e8b5c652	CollapseButton: Added hovering highlight + minor consistency tweaks.	2018-07-27 13:32:33 +02:00
omar	6211f40f3d	Internals: Drag and Drop: default drop preview use a narrower clipping rectangle (no effect here, but other branches uses a narrow clipping rectangle that was too small so this is a fix for it) + Comments	2018-07-27 12:39:42 +02:00
omar	0095b7a0ea	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-07-26 23:55:23 +02:00
omar	28c1a9857e	Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. (#319).	2018-07-26 23:50:05 +02:00
omar	63df9d6311	Internals: Extracted part of Begin into UpdateWindowParentAndRootLinks(). Useful to call to keep state updated immediately (namely useful for docking) + small tidying up of imgui_internal.h	2018-07-26 23:49:36 +02:00
OswaldHurlem	84183f5bb6	Assert that fmt != NULL before calling vsnprintf (#1969) ... In the case of Visual Studio 15.6 + Windows SDK 10.0, vsnprintf() with NULL format string appears to corrupt the stack...	2018-07-26 22:26:50 +02:00
omar	6b4f6cd2c5	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-26 19:25:55 +02:00
omar	dd0d5debef	Internals: Child windows that are clipped or part of a collapsed parent are not marked as collapsed anymore, but just a separate hidden marker set. We distinguish hiding for size measurement vs hiding for other reasons. Cleaned a little the end of Begin.	2018-07-26 19:24:27 +02:00
omar	0b045d8de5	Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh	2018-07-26 19:03:02 +02:00
omar	1b646a4440	Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh	2018-07-26 19:01:51 +02:00
omar	7adac4ab3e	FAQ update	2018-07-26 12:55:40 +02:00
omar	0c88fad6c2	Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. (#319)	2018-07-25 16:07:05 +02:00
omar	f22024cb19	Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h	2018-07-24 16:54:29 +02:00
omar	352695bc57	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-07-24 16:50:49 +02:00
omar	357534e588	Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.	2018-07-24 16:45:11 +02:00
omar	3a522b2400	Internals: Renamed one of the arrow functions so their name don't collide.	2018-07-24 16:41:17 +02:00
omar	528b50a89f	Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. (#1463, #1380, #1502)	2018-07-22 19:04:15 +02:00
omar	4b8ce24e46	Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function.	2018-07-22 18:57:28 +02:00
omar	4ebd442a24	Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)	2018-07-22 18:53:27 +02:00
omar	e07f5d4c78	Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.	2018-07-22 18:46:41 +02:00
omar	74077491ce	Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. (#1542)	2018-07-22 16:24:06 +02:00
omar	048add5ef2	ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879)	2018-07-19 15:22:18 +02:00
omar	23b67e6ff5	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-17 19:52:14 +02:00
omar	93321d3280	Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787)	2018-07-17 19:48:53 +02:00
Rokas Kupstys	7e59eb026b	Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)	2018-07-17 17:17:56 +02:00
omar	7b4fbf4301	Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)	2018-07-17 16:37:10 +02:00
omar	b8b74970d7	Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)	2018-07-17 16:04:47 +02:00
omar	defbf1c4b3	Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. (#1542)	2018-07-17 15:56:02 +02:00
omar	16c6734bcb	Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. (#1542). Will rework in the context of docking. (+1 squashed commits) ... + Fixed unused prototype warning (left-over from a merge)	2018-07-17 15:14:19 +02:00
omar	b30b82835a	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2018-07-12 11:48:49 +02:00
omar	d107146687	Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch)	2018-07-12 11:19:17 +02:00
omar	5e73e969fb	Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.	2018-07-12 11:08:24 +02:00
omar	88df66ec83	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h # imgui_draw.cpp # imgui_internal.h	2018-07-12 10:03:18 +02:00
omar	23288547ec	Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939)	2018-07-12 09:53:10 +02:00
omar	9007dff5eb	IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211) ... + shallow changelog tweaks	2018-07-10 19:16:57 +02:00
omar	b829671df1	Fixed missing value in GetStyleColorName(). (#1939) broken with c7016c2	2018-07-10 16:45:54 +02:00
omar	4dfb9ef751	Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.	2018-07-10 11:16:40 +02:00
omar	ce18371d1b	Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)	2018-07-09 21:49:49 +02:00
omar	dc021f1c23	Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)	2018-07-09 21:38:37 +02:00
omar	9dea27b273	Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)	2018-07-09 21:18:41 +02:00
omar	140ece0aeb	Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.	2018-07-09 21:18:10 +02:00
omar	7abf72ec78	Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. (#1542)	2018-07-09 21:13:51 +02:00
omar	17f36038e0	Internals: Misc/shallow merge from Docking branch.	2018-07-09 21:10:47 +02:00
omar	574185426c	Internals: Misc/shallow merge from Docking branch.	2018-07-09 21:06:46 +02:00
omar	7033b2043b	Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.	2018-07-09 20:34:12 +02:00
omar	dd61c4802a	Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)	2018-07-09 19:22:49 +02:00
omar	c7016c25e8	Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)	2018-07-09 19:16:48 +02:00
omar	14cef31467	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-09 16:24:01 +02:00
omar	0708f91617	Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).	2018-07-09 16:20:14 +02:00
omar	bd6097ac6f	Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.	2018-07-08 20:06:49 +02:00
omar	64938178b7	Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)	2018-07-08 18:23:12 +02:00
omar	a33f0d1f7f	Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143)	2018-07-08 16:38:57 +02:00
vby	3a42eb6620	Fix missing ImmReleaseContext in default Win32 IME handler (#1932)	2018-07-08 15:24:12 +02:00
omar	b0cdfe0ece	Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909)	2018-07-08 13:27:16 +02:00
omar	6277781e83	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-08 13:08:16 +02:00
omar	c790723cfa	Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143)	2018-07-08 13:03:39 +02:00
omar	d11d211e5d	Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. (#1909) Wider generalization of b16603745c.	2018-07-06 18:29:39 +02:00
omar	42bf149ac6	Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true to enable the feature globally. (#1495) The feature is not currently enabled by default because it is not satisfying enough.	2018-07-06 15:30:21 +02:00
omar	0146f4b456	Internals: BeginChildEx tweaks.	2018-07-05 09:17:16 +02:00
omar	7b2662d245	Examples: Comments, bits of documentation	2018-07-04 19:06:28 +02:00
omar	665bd1e140	Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.	2018-07-04 10:29:28 +02:00
omar	770cba0bd0	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h	2018-07-02 20:13:16 +02:00
omar	004fe8916a	Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)	2018-06-28 18:42:38 +02:00
omar	b16603745c	Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. (#1909)	2018-06-28 11:33:03 +02:00
omar	7adae3299e	Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments	2018-06-27 17:29:31 +02:00
omar	c38fe6b0e1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-06-26 12:41:36 +02:00
omar	79153cf19f	Internals: Various renaming. e.g. NewFrameUpdateHoveredWindowAndCaptureFlags() to UpdateHoveredWindowAndCaptureFlags() + exposed UpdateMovingWindow() in imgui_internal.h.	2018-06-26 12:40:37 +02:00
omar	14ceaaf460	ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.	2018-06-26 12:37:20 +02:00
omar	9d67d18d86	Internals: Moved some of the SliderBehaviorT code into SliderBehavior to reduce the amount of instanciated code.	2018-06-25 14:01:21 +02:00
omar	c1d8dee6c5	Version 1.63 WIP	2018-06-25 09:40:09 +02:00
omar	ce500f8727	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp	2018-06-22 12:01:42 +02:00
omar	1b74e3be02	Version 1.62	2018-06-22 09:41:25 +02:00
omar	40845852b9	Fixed warnings + readme	2018-06-16 10:23:11 +02:00
omar	7e6700d261	Viewport: Fix lagging overlay clipping rectangle on viewport owning window (affecting sync of multi-layered docking overlays). This was extremely tricky to find and fix (*). (#1541) ... (*) Merely assigning viewport->Pos = pos in UpdateMovingWindow() broke a series of thing because the code that assign viewports and viewport flags relied on moving window leaving its own viewport the first time to set the NoInputs flag.	2018-06-15 19:40:17 +02:00
omar	c71522adc5	Viewport: Comments. Removed misleading test for !window->ViewportOwned in UpdateSelectWindowViewport(). (#1541)	2018-06-15 19:40:00 +02:00
omar	70b0bd13aa	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # imgui.cpp # imgui.h	2018-06-14 15:30:15 +02:00
omar	b5d385824d	Added assert in TreePop() to ease catching ID stack underflow earlier.	2018-06-14 15:11:14 +02:00
omar	826d77185e	Revert 640c0566: TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless -> more flexible to keep allowing it by default so it setup an ID scope.	2018-06-14 15:10:46 +02:00
omar	ce0b36ba10	Added _None values to various enum flags, useful for readability and some coding style likes it. (Unfortunately we can't refer to them as default value in imgui.h functions because they need to be declared below).	2018-06-13 23:22:19 +02:00
omar	2a6fbb2197	Speculative fix for Win32 clipboard handler if SetClipboardText() fails + Minor fix for static analyzer + using :: prefix when calling in Win32 functions.	2018-06-13 22:22:52 +02:00
omar	d57fc7fb97	Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. (#820, #956, #1875)	2018-06-13 00:10:33 +02:00
omar	be4b8b5615	Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.	2018-06-13 00:02:19 +02:00
omar	cd455a4600	Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. (#820, #956, #1875)	2018-06-12 18:44:33 +02:00
omar	c725710c6d	Comments	2018-06-12 18:25:04 +02:00
omar	24aeca3d0c	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # examples/imgui_impl_vulkan.h # examples/imgui_impl_win32.cpp	2018-06-12 16:24:24 +02:00
omar	cdf51cad2d	Comments, documentation	2018-06-11 19:52:40 +02:00
omar	ff4f40de41	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-06-08 20:22:07 +02:00
omar	85f9694bd4	Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). (#1870) ... Read examples/README.txt for some details. ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)	2018-06-08 19:37:33 +02:00
omar	8c374512fd	Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. (#1542)	2018-06-07 22:10:31 +02:00
omar	8e48ab6b19	Nav: Addendum: only set io.WantSetMousePos if necessary. (#1867)	2018-06-07 18:08:59 +02:00
omar	e3710448ae	Nav: Removed an unnecessary assertion that could fail when using Mouse and Keyboard simultaneously with the NavEnableSetMousePos flag. (#1867)	2018-06-07 18:04:44 +02:00
omar	929529a0db	SliderFloat(): When using keyboard/gamepad and a zero precision format string (e.g. "%.0f"), always step in integer units. (#1866)	2018-06-07 13:29:54 +02:00
omar	b3a5b8debd	Popup: Improved handling of (erroneously) repeating calls to OpenPopup() to not fully close/re-open the popup so its child popups won't get closed. (#1497, #1533, #1865). ... Followup/fix the change made in deab2ab015	2018-06-06 19:25:49 +02:00
omar	5a288b2d3a	Readme, FAQ tweaks (#1807)	2018-06-06 13:02:19 +02:00
omar	d44faa165a	Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. (#1859) ... Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.	2018-06-06 12:35:36 +02:00
omar	2a56105f85	TreeNodeEx(): The helper ImGuiTreeNodeFlags_CollapsingHeader flag now include ImGuiTreeNodeFlags_NoTreePushOnOpen. The flag was already set by CollapsingHeader(). The only difference is if you were using TreeNodeEx() manually with ImGuiTreeNodeFlags_CollapsingHeader and without ImGuiTreeNodeFlags_NoTreePushOnOpen. In which case you can remove the ImGuiTreeNodeFlags_NoTreePushOnOpen flag from your call (ImGuiTreeNodeFlags_CollapsingHeader & ~ImGuiTreeNodeFlags_NoTreePushOnOpen). (#1864)	2018-06-06 11:39:29 +02:00
omar	916528080e	InputTextMultiline(): Fixed double navigation highlight when scrollbar is active. (#787)	2018-06-05 16:16:54 +02:00
omar	512ffa37bd	Nav: Fixed clipped scoring when exiting a NavFlattened child back to a parent item (clipping not desirable then). (followup and fix to c665c15). (#787)	2018-06-05 16:12:46 +02:00
omar	93b032ea92	Merge branch 'master' into viewport ... # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp	2018-06-05 15:51:52 +02:00
omar	6d98c0323b	Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). (#787)	2018-06-05 15:49:33 +02:00
omar	2bdf0b54a2	Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().	2018-06-05 15:34:22 +02:00
omar	c665c15a7d	Nav: When entering into a NavFlattened child we only consider the visible items for scoring (note that this only work assuming the NavFlattened child window has interactive items). Fixes accidentally hoping into a NavFlattened child. (#767)	2018-06-04 18:18:12 +02:00
omar	f4120e20d5	Nav: NavFlattened: Fixed navigation miscrolling parent window when the current window is scrolling enough to keep the item in view. Fix feature added in e11610d6, typically affect large navigation steps (used by PageUp/PageDown). + comments (#787)	2018-06-04 18:18:11 +02:00
omar	5a7e98c7cf	Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix.	2018-06-04 15:43:33 +02:00
omar	948009a8b2	Intensive FAQ answer for the million of people asking the same questions over and over again. (#1848, #1791, #1840, #1493, #1295)	2018-05-30 16:31:34 +02:00
omar	a2198bcf6b	Made mouse drag distance calculation more robust to invalid mouse position. (#1845)	2018-05-29 10:47:18 +02:00
omar	08e20ae465	Internals: Reintroducing LastActiveIdTimer because it is useful and to reduce merge conflicts. (#1537)	2018-05-28 21:48:25 +02:00
omar	d4b151076c	Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9. (#1739, #143).	2018-05-28 21:40:09 +02:00
omar	3218666fb9	Made drag source tooltip display at the same position as a regular tooltip to avoid discontinuity where dynamically swapping tooltip at the target site. Made drag source tooltip override previous tooltip if any. (#1739, #143).	2018-05-28 21:24:03 +02:00
omar	92b7d6bc4f	Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)	2018-05-28 20:57:41 +02:00
omar	7fd9199a1d	Internals: Selectable: Renamed variables. Todo update.	2018-05-28 17:13:40 +02:00
omar	f843facba4	Internals: PushItemFlag() flags are inherited by BeginChild().	2018-05-28 15:30:42 +02:00
omar	0e83d74698	Documentation: FAQ, ID Stack, Fonts (#1839, #1840), #1842)	2018-05-27 22:32:46 +02:00
omar	03c8a78f04	Merge branch 'master' into viewport ... # Conflicts: # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp	2018-05-25 12:44:56 +02:00
omar	251f178a6f	Drag and Drop: Source doesn't report as hovered (at a lower-level). Source disable AllowOverlap flag if any set. (#143)	2018-05-24 18:05:50 +02:00
omar	b88fbd69cc	Drag and Drop: BeginDragDropSource(): Offset tooltip position so it is off the mouse cursor, but also closer to it than regular tooltips, and not clamped by viewport. (#1739)	2018-05-23 23:19:01 +02:00
omar	09ea376a6a	BeginCombo(), BeginMainMenuBar(), BeginChildFrame(): restore modified style at end of Begin instead of End so doesn't affect child windows, BeginTooltip() etc.. (allowed since 7b6b7038c5)	2018-05-23 23:05:26 +02:00
omar	002e513b82	Added float GetWindowDpiScale(). (#1542, #1676)	2018-05-23 18:25:37 +02:00
omar	ed84b2aaeb	Viewport, Platform: Fixed a crash if the back-end set the PlatformRequestMove/PlatformRequestSize flags while viewports were disabled (it happened in the SDL back-end, and generally we want to tolerate it to make back-end implementation simpler). (#1542)	2018-05-23 18:01:50 +02:00
omar	bf56b6b9a5	ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. (#1826)	2018-05-21 10:13:21 +02:00
omar	1176460e44	Viewport: Fixed using ImGuiConfigFlags_ViewportsNoMerge always showing the Debug window by testing the Active flag as well. (#1542)	2018-05-19 20:45:49 +02:00
omar	6c684ae39b	Fixed GCC pre-8 build. (#1822) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo	2018-05-17 18:10:20 +02:00
omar	01429e7d16	Merge branch 'master' into viewport ... # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h	2018-05-17 15:03:56 +02:00
omar	64b1645deb	Disabled GCC 8.1.0 warnings -Wclass-memaccess (#1822)	2018-05-17 14:19:20 +02:00
omar	d5c8f404b2	Remove trailing white spaces.	2018-05-17 14:12:37 +02:00
omar	ede5059e69	Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose	2018-05-17 10:48:15 +02:00
omar	4c35e00f49	Viewport: Made GetWindowViewport() not flag the window as written to.	2018-05-16 22:48:54 +02:00
omar	86f8cdbd98	Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.	2018-05-16 18:03:37 +02:00
omar	7f960616e0	Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. (#1542)	2018-05-16 14:34:46 +02:00
omar	1cafdb5b46	Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. (#1542)	2018-05-15 11:04:07 +02:00
omar	640c056602	TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.	2018-05-14 23:36:37 +02:00
omar	99ff6fc7e4	Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). (#787)	2018-05-14 23:07:35 +02:00
omar	e11610d6ff	Nav: To keep the navigated item in view we also attempt to scroll the parent window as well as the current window. (#787)	2018-05-14 19:50:48 +02:00
omar	036dce634e	Version 1.62 WIP	2018-05-14 19:19:19 +02:00
omar	b0fb340b57	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-05-14 13:15:21 +02:00
omar	78b28d545f	Version 1.61 + todo additions	2018-05-14 12:34:47 +02:00
omar	3f29ed6fd5	ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.	2018-05-13 23:41:43 +02:00
omar	725c13ca68	Fix for atof with glibc.	2018-05-13 22:43:43 +02:00
omar	2a2bb8970d	Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.	2018-05-13 22:31:29 +02:00
omar	ff033f431b	Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.	2018-05-13 21:04:07 +02:00
omar	7475c1e7dd	Data types: DragScalar: Fixed speed of integer values tweaking with keyboard/gamepad when speed < 1. Enforce min/max bounds when power curves are used. SliderScalar: Fixed integer/slow tweaking. (#643)	2018-05-12 17:39:34 +02:00
omar	85f3ba844c	Merge branch 'master' into viewport ... # Conflicts: # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h	2018-05-11 22:22:41 +02:00
omar	fc7fc83f9e	Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.	2018-05-11 19:27:27 +02:00
omar	0dc18a6ca6	Documentation tweaks, comments	2018-05-11 16:54:50 +02:00
omar	8149408408	Merge branch 'data_types' ... # Conflicts: # CHANGELOG.txt # imgui.cpp	2018-05-11 16:48:50 +02:00
omar	14f575ff76	Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. (#1804)	2018-05-10 14:31:04 +02:00
omar	6eacddb50f	Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. (#1542)	2018-05-10 13:10:04 +02:00
omar	91e39e72a3	Combo: Horizontally offset items using WindowPadding instead of Indent, for consistency.	2018-05-09 23:12:35 +02:00
omar	773d484009	Internals: Made ContentsRegionRect absolute to reduce confusion. Renamed InnerRect to InnerMainRect, renamed WindowRectClipper to OuterRectClipped.	2018-05-09 23:12:34 +02:00
omar	f83f566530	Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.	2018-05-09 21:48:03 +02:00
omar	4cabf599c4	Data types: Fix format srtings with leading blanks. Fix ColorEdit4() to not use obsolete formats (when using IMGUI_DISABLE_OBSOLETE_FUNCTIONS) (#643)	2018-05-08 23:41:46 +02:00
omar	ad2927888b	Apply fix from data_types branch, some widgets broken when format string doesn't contains a %. Broken by 92f0165f85. Data_types branch fix c5fb929555.	2018-05-08 20:07:25 +02:00
omar	5f464877ed	Internals: Declaring DragBehavior, SliderBehavior in there (no warantee given) as they may be useful to custom widgets.	2018-05-08 19:52:56 +02:00
omar	c5fb929555	Data types: Fixed empty format string (or no % specifier) breaking the parsing back of values.	2018-05-08 19:52:55 +02:00
omar	280c05e4f8	Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.	2018-05-08 11:02:38 +02:00
omar	4ff23d3306	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2018-05-07 22:23:58 +02:00
omar	0bf43b3a1b	Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)	2018-05-07 22:18:45 +02:00
omar	023cc25c7c	Internals: Removed unnecessary allocation indirection for g.LogClipboard (this only made sense when there was a global context instance)	2018-05-07 22:15:25 +02:00
omar	3e8087458d	SliderScalar, VSliderScalar(): Support for any data types. Tested with various ranges/limits. Note that Drag/Slider/Input currently fail if the format string doesn't preview the actual value. Will fix next. (#320, #643, #708, #1011)	2018-05-04 20:55:51 +02:00
omar	944f414cc6	Internals: A few selected math helpers are now using template to handle all supported types. Added ImPow() to wrap float/double in a standard manner without calling pow(double) when not needed in Drag code.	2018-05-04 18:14:59 +02:00
omar	f4c16fbb99	Internals: Data types: Made format string optional. DragBehavior: Moved a bit of code outside of the template. Slider tidying up. Removed unnecessary call to fabsf().	2018-05-04 17:57:47 +02:00
omar	dcd26f1295	DragFloat, DragInt: Default format string is none is passed to the function. Fixed demo using old style %.0f.	2018-05-04 16:41:48 +02:00
omar	f47c756755	Internals: Missing const, some renaming. Tweak legacy fast path.	2018-05-03 22:12:55 +02:00
omar	0699ae161f	DragInt, DragScalar: Actually made the fast-past handle the now-most-common case..	2018-05-03 21:49:38 +02:00
omar	7640439747	DragInt: Patch old format strings to replace %f by %d when using the DragInt() entry point. (#320, #643, #708, #1011)	2018-05-03 21:35:04 +02:00
omar	069b284f17	Internals: Tidying up internal helpers. Fixed a case ImParseFormatTrimDecorations() can return an off by one (out of bound) pointer if the format string is invalid. Extracted ImParseFormatFindEnd() out of TrimDecorations so we can use it to find the format type and replace the %f in old Int apis.	2018-05-03 20:22:29 +02:00
omar	086c3925c4	Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. (#320, #643, #708, #1011)	2018-05-03 19:42:35 +02:00
omar	6c932479f2	Internal: DragScalar(), InputScalar() now support signed/unsigned, 32/64 bits, float/double data types. (#320, #643, #708, #1011)	2018-05-03 17:34:38 +02:00
omar	93b8580a8d	Internals: DragFloat: Fixed power handling. Use an temporary accumulator and no absolute values so we will be able to manipulate double as well as 64-bit integers. (#1011, #708, #320)	2018-05-03 17:34:33 +02:00
omar	3f04fd0644	Internals: DragFloat: Removed DragSpeedScaleFast/DragSpeedScaleSlow since it's not yet usable and Nav version doesn't have an equivalent.	2018-05-03 17:34:29 +02:00
omar	4780ac1ca4	Internals: Data types: Added s64, u64 data types. Added support in InputScalar(). Removed internal.h InputScalarEx() to InputScalar(). Removed cheap-relative-operators support in recently added U32 data path, since this is heading toward being legacy code. + Fixed InputDouble parsing code. (#1011, #320, #708)	2018-05-03 17:34:22 +02:00
omar	d9fa1f869e	Comments about using "power curves". Demo tweaks. (#648)	2018-05-03 17:34:15 +02:00
omar	8a370f6491	SliderFloat: Fixed grab size and steps with %g format. (#642, #1301)	2018-05-03 17:34:09 +02:00
omar	10e3f17235	DragFloat/SliderFloat internal InputScalar trim leading/trailing spaces emitted from the format string when presenting an edit box to the user. (#648) ... Follow up to 6881d065b8	2018-05-03 17:34:02 +02:00
omar	a62f195e83	Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.	2018-05-03 17:33:55 +02:00
omar	ef05141a06	Internals: InputScalarEx: Tweak internals so there is a fast path for the simple case. ... (in particular because it makes it clear what the extra code is for, so people tempted to create their own InputText data transform/handler understand how little is actually needed)	2018-04-30 20:12:14 +02:00
omar	ed756d474e	Internals: Added ImGuiDataType_Uint32 data type which is usable with InputScalarEx().	2018-04-30 20:02:33 +02:00
omar	7df985bc5c	Nav: Fixed hovering a Selectable() with the mouse so that it update the navigation cursor. Fixed c8b9b2c6 which was incorrect (#787)	2018-04-30 19:40:25 +02:00
omar	a1da7f9860	Internals: Tweaked ParseFormatPrecision(), clarified its more limited purpose, allowing 2-digits precisions since it makes (some) sense for doubles. (#648)	2018-04-30 16:52:16 +02:00
omar	92f0165f85	DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. (#648)	2018-04-30 16:44:57 +02:00
omar	6881d065b8	DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. (#648)	2018-04-30 15:59:59 +02:00
omar	d7e24416dd	DragFloat/SliderFloat internal InputScalar relies on the user supplied format string to format and parse value. (#648) ... The trailing text after the format will be displayed in the InputText but not affect back parsing. Ideally we can try to strip it later.	2018-04-30 15:21:51 +02:00
omar	f2e9dddeca	DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.	2018-04-28 10:43:15 +02:00
omar	f80314754c	InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. (#648)	2018-04-28 00:11:40 +02:00
omar	73445ff248	Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. (#648, #642)	2018-04-27 23:44:27 +02:00
omar	8a38271a7c	SliderFloat, DragFloat: Fix to allow input of scientific notation when Ctrl+Clicking a slider or drag, matching the change done in c19b2781 for InputFloat(). (#648, #1011)	2018-04-27 23:18:28 +02:00
omar	066550de68	DragFloat, DragInt: Cancel mouse tweak when current value is initially past the min/max boundaries and mouse is pushing in the same direction (keyboard/gamepad version already did this).	2018-04-27 19:15:25 +02:00
omar	a84aff1875	Internals: DragBehavior: tweaks internals.	2018-04-27 18:22:10 +02:00
omar	1d99b5f963	Internals: Reordered parameters of DataTypeFormatString() internal helper functions and shallow tweaks.	2018-04-27 18:19:59 +02:00
omar	101f9b42b7	InputText: Fixed returning true when edition is cancelled with Esc and the current buffer matches the initial value.	2018-04-27 17:32:03 +02:00
omar	c47d34cf70	Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.	2018-04-27 15:13:22 +02:00
omar	cd51f37fc0	Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. (#1542)	2018-04-26 16:18:47 +02:00
omar	da70c837da	Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. (#1542)	2018-04-26 15:30:19 +02:00
omar	f1ae07e532	Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. (#1542)	2018-04-26 11:52:38 +02:00
Bruce Mitchener	f8c9c33d33	Fixed static analyzers warnings with bool literals (#1775) ... * Use `false` instead of `0` for a bool literal. * Simplify calls to RadioButton to not need bool literals.	2018-04-26 09:51:46 +02:00
omar	d9cd494eaf	Viewport: Moved ScaleWindow* code in a proper location. Various comments.	2018-04-25 23:21:26 +02:00
omar	eb1c36fdfb	Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695, #1769)	2018-04-25 22:07:14 +02:00
omar	5979233a3c	Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.	2018-04-25 18:23:39 +02:00
omar	0b1d6a0d52	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2018-04-25 18:13:23 +02:00
omar	711a63befc	Misc: Stop moving window if mouse position becomes invalid. Flagged menus are _NoMove for sanity.	2018-04-25 17:58:54 +02:00
omar	d317d90610	Misc: NavCalcPreferredRefPos selects between mouse and nav reference position + added sanity assert (merged from viewport branch to minimize branch drift).	2018-04-25 17:58:54 +02:00
omar	9cbca8c127	Begin: Shuffled some code, _should_ have no side-effect. Clear NextWindowData in one call and more consistently. (merged from viewport branch to minimize branch drift).	2018-04-25 17:58:54 +02:00
omar	e3453d0dc4	Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).	2018-04-25 17:58:53 +02:00
Bruce Mitchener	b28535d1da	ImGuiTextBuffer::appendfv needs to va_end the args_copy.	2018-04-25 17:40:39 +02:00
omar	7b433605f9	Viewport: Avoid creating viewport on drag (fix cc882b0723)	2018-04-25 15:38:32 +02:00
omar	3b9b1956cd	Merge branch 'master' into viewport ... # Conflicts: # examples/allegro5_example/imgui_impl_a5.cpp # examples/allegro5_example/imgui_impl_a5.h # examples/allegro5_example/imgui_impl_allegro5.cpp # examples/allegro5_example/imgui_impl_allegro5.h # examples/allegro5_example/main.cpp # examples/imgui_impl_allegro5.cpp # examples/imgui_impl_allegro5.h # imgui.cpp # imgui_internal.h	2018-04-25 15:32:04 +02:00
omar	01fa934222	Internals: Removed unecessary Pos/PosFloat separation, only reason appears to be mostly pre-1.0. The only piece of code that I expected sub-pixel window position to matter actually already round its delta (wrongly so, will fix later/separately if we want).	2018-04-25 15:24:26 +02:00
omar	cc882b0723	Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). (#1542)	2018-04-25 15:14:51 +02:00
omar	6d6580f6be	Viewport: Fixed glitches with newly appearing menus creating viewport while the underlying imgui window should be hidden. (#1542)	2018-04-25 11:23:58 +02:00
omar	7684f53328	Viewport: Fixed issues with popups drifting in particular when reference mouse position become invalid (e.g. changing app focus while viewported-menu is open). Storing monitor index in viewport at beginning of the frame. (#1542)	2018-04-25 11:23:58 +02:00
Bruce Mitchener	7ebdadf92b	Fix various typos.	2018-04-25 09:40:14 +02:00
omar	e3e4b7bdf5	Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. (#1542) ... Platform: Clarifying some comments in back-ends.	2018-04-24 17:10:27 +02:00
omar	679f4882a5	Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)	2018-04-24 17:10:26 +02:00
omar	46698c96c5	Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)	2018-04-24 16:48:26 +02:00
omar	dc03c93164	Internals: Removed misleading ImRect::FixInverted + fix minor formatting in Readme. ... Demo: Fixed Overlay: Added a context menu item to enable freely moving the window.	2018-04-24 14:19:10 +02:00
omar	cb78e62df9	Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. (#1542) ... SDL2 ime support under Win32 never worked properly because of SDL interferences.	2018-04-24 12:40:38 +02:00
omar	376f2aec54	Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. (#1542)	2018-04-23 23:01:37 +02:00
omar	010757266e	Viewports: Todos, Tooltips/menus not automatically forced into their own viewport when the NoMerge flag is set (however the multiplication of viewports makes them more likely to protude and create their own). Win32: try to make primary monitor the first tin the list. (#1542)	2018-04-23 23:00:14 +02:00
omar	d268471285	Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.	2018-04-23 18:56:25 +02:00
omar	7b6b7038c5	Window: Relaxed the internal stack size checker to allow Push/Begin/Pop/.../End patterns to be used with PushStyleColor, PushStyleVar, PushFont without causing a false positive assert. (#1767)	2018-04-23 17:58:49 +02:00
omar	f1c31ebc67	Viewport: Fixed initial popup positioning not using the monitor area properly. (#1542)	2018-04-23 12:52:01 +02:00
omar	4433ce4312	Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. (#1542)	2018-04-23 12:38:20 +02:00
omar	22773e03a2	InputText: On Mac OS X, support Cmd+Shift+Z for Redo. Cmd+Y is also supported as major apps seems to default to support both. (#1765)	2018-04-23 11:15:13 +02:00
omar	e2f831c80e	InputText: tweaks, minor refactoring, renaming + comments (#1695)	2018-04-23 11:09:16 +02:00
omar	456bbffcc4	Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. (#1542)	2018-04-20 21:36:36 +02:00
omar	037d5a7e98	Columns: Fixed a bug introduced in 1.51 where columns would affect the contents size of their container, often creating feedback loops when ImGuiWindowFlags_AlwaysAutoResize was used. (#1760)	2018-04-20 16:03:21 +02:00
omar	49a451d247	Window: Fixed windows using the ImGuiWindowFlags_NoSavedSettings flag from not using the same default position as other windows. (#1760)	2018-04-20 15:40:12 +02:00
omar	f93dce9513	InputText: Tweak to make the if statement more readable + update Changelog (#1747)	2018-04-19 16:21:32 +02:00
Mikko Sivulainen	1554d97492	on OSX, ignore text input when CMD key is down	2018-04-19 16:17:57 +02:00
omar	637d9c42bf	Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. (#1542)	2018-04-19 13:12:02 +02:00
omar	f5700f238d	Documentations for Github users. Metrics: Fixed display of NavRectRel, added display of ParentWindow.	2018-04-19 11:08:20 +02:00
omar	1c385c2ca4	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.cpp # imgui_internal.h	2018-04-18 19:06:49 +02:00
omar	6d6f4a85f6	Fixed DisplaySafeAreaPadding not affecting popups/tooltips/menus at it should have (partly broken in 2e5577f44f).	2018-04-18 17:40:38 +02:00
omar	6a0b2627ad	BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. (#1439)	2018-04-18 17:37:35 +02:00
Doug Binks	1e41bad90f	Added DisplaySafeAreaPadding to MainMenuBar height and fixed starting x position. Fixes main menu bar problems with TVs. (#1439)	2018-04-18 15:13:09 +02:00
omar	7241dc61d4	Fixed default proportional item width lagging by one frame on resize + miscellaneous minor tweaks.	2018-04-17 23:36:59 +02:00
omar	25f25d546d	Viewport: Fixed manual mouse resize to handle mouse viewport change, which will allow resizing a window while it changes viewport. Releasing manual resize may merge a window. Added ConvertViewportPosToViewportPos() helper. Renamed NewFrameUpdateMovingWindowDropViewport() to UpdateTryMergeWindowIntoHostViewport() and removed the now-unnecessary half of the function. + renaming (#1542)	2018-04-17 23:34:19 +02:00
omar	6ac50634e3	Viewport: Tweaked selection of g.MouseRefViewport, in particular aimed at fixing browsing child-menus while holding mouse buttons with menus in multiple viewports. (#1542)	2018-04-17 18:25:05 +02:00
omar	50e453a3e2	Viewport: Comments, tweaks, renaming. Removed unnecessary stuff. Fixed zealous Clang warning. (#1542)	2018-04-17 18:25:05 +02:00
omar	4649bf042e	Viewport: Render: Fix draw list build code to allow child windows to be in a different viewports (which will happen with e.g. extruding menus). (#1542)	2018-04-16 17:12:00 +02:00
omar	2bd0ee27f0	Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. (#1542)	2018-04-16 17:12:00 +02:00
omar	0d16492eb7	Viewport: Moved ImGuiWindowFlags_FullViewport to an internal ViewportOwned flag. Renamed AddViewport to AddUpdateViewport. (#Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. (#1542))	2018-04-16 17:11:59 +02:00
omar	2ae19801a9	Viewport: Remove old code that never worked (testing wrong flag type, always false) + shuffled a few things in Begin() to clarify dependencies. Fixed viewport change on Begin/Begin/End/End patterns. (#1542)	2018-04-16 17:11:59 +02:00
daniel-murray	83d97d4a9b	Fix typos KeyDown => KeysDown	2018-04-14 10:28:10 +02:00
omar	d1c16d4ccd	Documentation bits. Misc comments.	2018-04-13 22:23:34 +02:00
omar	950539b768	Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. (#1542, #1676)	2018-04-13 20:26:36 +02:00
omar	f270d6c52c	Viewport: Fix to allow changing/animated window name to be reflected in the OS e.g. task bar, so named documents can appear properly. (#1542)	2018-04-13 16:21:34 +02:00
omar	22d6f00110	Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. (#1542, #1676)	2018-04-13 11:14:06 +02:00
omar	38e357ef10	Viewport: Virtual mouse position are patched immediately when viewports are moved in the virtual space, avoiding interaction glitchs on a resizing frame. (#1542)	2018-04-12 19:57:35 +02:00
omar	0b7f3edc26	Viewport: Debug/metrics tweaks + renaming comments	2018-04-12 19:57:34 +02:00
Guillaume Chereau	58fd8ea303	Fix minor error in doc ... Not a big deal.	2018-04-12 13:18:26 +02:00
omar	285269ef55	Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. (#1542)	2018-04-11 21:27:19 +02:00
omar	e25da4230b	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-04-11 21:25:44 +02:00
omar	8be6f40ae1	Viewport: per-viewport overlay draw list created on demand. With this pattern it'll be easier to consider adding more (e.g. background draw list). (#545)	2018-04-11 21:21:52 +02:00
omar	d1d2bbf86a	Internals: Popup: Moved popup/menu/tooltip positioning code (viewport branch needs it organized in a different manner, so we are pushing the bulk of it here to minimize differences).	2018-04-11 17:01:19 +02:00
omar	bfc0efaae9	Internals: Window: Aggregating ImDrawList into the ImGuiWindow structure.	2018-04-11 12:43:38 +02:00
omar	84fe711bdf	Settings: Fixed saving an empty .ini file if CreateContext/DestroyContext are called without a single call to NewFrame(). (#1741)	2018-04-11 10:08:23 +02:00
omar	296f03374b	NewFrame: Prevent division by zero in frame rate calculation if io.DeltaTime is continuously zero. (#1740, #881)	2018-04-10 23:48:27 +02:00
omar	83bd3595a4	Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. (#1542)	2018-04-10 22:58:39 +02:00
omar	32ee0a3947	Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. (#1542)	2018-04-10 22:32:08 +02:00
omar	7ddc22b326	Viewports, DPI: Renamed config flags. (#1542)	2018-04-10 20:02:43 +02:00
omar	0d5042f0f3	Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. (#1542)	2018-04-10 19:15:44 +02:00
omar	0eaddb4dcd	Viewport: shuffled some code in the UpdateSelectWindowViewport() function.	2018-04-10 18:47:23 +02:00
omar	928a4ad315	Begin: moved tooltip position code in an else block. Misc comments	2018-04-10 16:51:16 +02:00
omar	52cac135c9	Internals: Renamed GetFrontMostModalRootWindow() to GetFrontMostPopupModal() and exposed in imgui_internal.h (#1738)	2018-04-10 15:04:36 +02:00
omar	d4dd448511	Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.	2018-04-09 22:01:58 +02:00
omar	9117632bf0	Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.	2018-04-09 20:42:49 +02:00
omar	56ad2a2d74	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/vulkan_example/main.cpp # imgui.h	2018-04-09 19:35:14 +02:00
omar	6f1f5cbc20	Version 1.61 WIP	2018-04-09 14:02:32 +02:00
omar	3a29ddbcfa	Version 1.60	2018-04-08 00:45:02 +02:00
omar	6d0c720451	Internals: Removed unused internal variant of ArrowButton().	2018-04-07 23:06:06 +02:00
omar	82b7a39f31	Fixed a few zealous warnings.	2018-04-07 10:38:01 +02:00
omar	c712f7275d	Fixed unused variable warning.	2018-04-07 10:25:51 +02:00
omar	f421e73b40	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h	2018-04-06 23:36:23 +02:00
omar	c2fc978983	Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) (#707)	2018-04-06 23:25:25 +02:00
omar	0734a12d25	IO: ImGuiConfigFlags_NoMouse disable hovering so it is not destructive. Amend 2464e62a1a	2018-04-06 23:05:53 +02:00
omar	e88fb10d7c	NewFrame: Extract some code into a NewFrameUpdateHoveredWindowAndCaptureFlags() which can be of use with touch-based inputs systems.	2018-04-06 19:36:15 +02:00
omar	c1bdab6d5b	Comments about io.WantCapture flags + todo entries.	2018-04-06 19:36:14 +02:00
omar	ac2027c415	NewFrame: Extract some code into a NewFrameUpdateMouseInputs function. Moved settings saving higher up in the function so it is next to its peers.	2018-04-06 19:36:14 +02:00
omar	2464e62a1a	IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().	2018-04-06 19:36:13 +02:00
omar	18a243bef0	Columns: Fixed calling Columns() again with the same number of columns. (#125)	2018-04-06 17:50:50 +02:00
omar	72899318e6	Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha (#1542) + fixes for GLFW 3.3	2018-04-05 17:07:46 +02:00
omar	c23b5463c7	Viewport: Moving a window accross viewports tries to preserve the dragging pivot (that is assuming that the window will be evenly scaled by DPI, aka Style is scaled). (#1542)	2018-04-05 11:40:33 +02:00
omar	9d8bc79025	Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. (#1542)	2018-04-05 11:06:00 +02:00
omar	0cad274b87	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # imgui.cpp	2018-04-04 19:39:42 +02:00
omar	fc30462f18	Hide new windows for one frame until they calculate their size. Also fixes SetNextWindowPos() given a non-zero pivot. (#1694)	2018-04-04 19:35:08 +02:00
omar	5aa3f99b4c	Internal: using more consistent comparaison with HiddenFrames to not imply it could be -1. Tweaked comments.	2018-04-04 17:21:36 +02:00
omar	4649967112	Added extra comments and assertions to avoid user combining ImGuiCond flags. (#1694)	2018-04-04 15:01:01 +02:00
omar	cd1e6e384f	Tooltip windows uses PopupBorderSize (#1697) + commented out debug stuff.	2018-04-04 12:39:48 +02:00
omar	1e116e6c17	Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.	2018-04-03 23:18:43 +02:00
omar	84fbc49403	BeginChild: named child don't include the full id inside their name (#1698)	2018-04-03 22:13:35 +02:00
omar	78610a54d2	Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.	2018-04-03 20:55:30 +02:00
omar	77e234d9df	Comments	2018-04-03 20:22:44 +02:00
omar	c461401b21	Comments, FAQ	2018-04-03 20:05:59 +02:00
omar	cc96477b1c	Comments (#1695)	2018-03-25 14:45:40 +02:00
omar	ac8931b2e9	Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. (#1542)	2018-03-22 22:09:42 +01:00
omar	4f112f898e	Viewport: Avoid modifying MousePos in UpdateWindowViewport just for the sake of docking test, sheering MousePos during the frame is problematic + minor renaming. (#1542)	2018-03-22 21:14:55 +01:00
omar	b69dc45f6e	Internals: Removed ImGuiDataType_Float2.	2018-03-22 20:14:31 +01:00
omar	c19b27813d	Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well.	2018-03-22 18:58:40 +01:00
omar	c796960ff9	InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011)	2018-03-22 17:49:53 +01:00
omar	21ac470a8a	Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.	2018-03-22 16:37:21 +01:00
omar	e5ba982be0	Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.	2018-03-21 22:48:23 +01:00
omar	42ad3c1dd3	Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. (#1542) + Metrics: Fix undisplayed flag.	2018-03-20 22:19:41 +01:00
omar	172570acae	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/vulkan_example/imgui_impl_glfw_vulkan.cpp # imgui.h	2018-03-20 22:14:34 +01:00
omar	75c3793db5	IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)	2018-03-20 21:19:23 +01:00
omar	dcf7c3d188	Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542)	2018-03-20 20:39:44 +01:00
omar	170f44e6f0	IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787)	2018-03-20 20:12:34 +01:00
omar	c29971cf72	Merge branch 'master' into viewport ... # Conflicts: # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp	2018-03-20 16:05:31 +01:00
omar	ccc9a22db3	Viewport: Changelog + Internals: Renamed viewport mouse fields for consistency (going to add more). (#1542)	2018-03-19 22:59:55 +01:00
omar	d1c45db9e8	Fixed enum typo.	2018-03-19 22:47:10 +01:00
omar	c00523dba4	Viewport: Added extra Metrics and debug features.	2018-03-19 18:07:12 +01:00
omar	9d5ec05150	Viewport, Platform: Update the contents of GetPlatformData() in EndFrame() so back-end can access it even if UpdatePlatformWindows hasn't been called. (#1542)	2018-03-19 17:33:21 +01:00
omar	2fecd332fc	Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)	2018-03-19 15:20:47 +01:00
omar	62e94717eb	Nav: InputText: Allow editing text input fields with NavActivate (space). Not sure about that, on one hand it feels more consistent but you can't finish the editing with space to double space (activate + input space) could feel inconsistent. (#787)	2018-03-19 13:20:25 +01:00
omar	33ad8b2f0c	Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks	2018-03-19 13:20:18 +01:00
omar	46b61427e1	Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. (#1542, #1042)	2018-03-18 18:44:57 +01:00
omar	1ab236d9df	Viewport, Platform: Internal renaming to use more consistent (OsDesktopPos > PlatformPos). (#1542)	2018-03-15 20:07:48 +01:00
omar	8364d1ca6c	Viewport: Removed back-end renderer code that implied we need to clear with WindowBg color. Added NoRendererClear flag. (#1542, #1042)	2018-03-15 18:17:04 +01:00
omar	6e58a95a01	Viewport, Platform, Examples: Changes to resizing flow + restored support for Platform events affecting the ImGui windows (so Decorated windows are functional). (#1542, #1042) .. ... SDL: Added platform move/resize/close support. GLFW: Added platform move/resize support. Moved Close to use callback for consistency. Win32: Vulkan: Fixed resize support. Naming is WIP "PlatforrmRequestXXX" is too ambiguous. Basically we either have a ImGui->Platform flow or a Platform->ImGui flow. Working a bigger refactor now.	2018-03-15 10:57:22 +01:00
omar	207ad45983	Metrics: Displaying all draw lists of a window (if it uses layer 0 and has already been appended to earlier in the frame).	2018-03-14 17:50:11 +01:00
omar	921bb92eec	Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. (#1542)	2018-03-13 16:20:34 +01:00
omar	c50198debe	Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542) wip	2018-03-13 16:20:27 +01:00
omar	6371474031	Viewport: Removed unnecessary function hoop.	2018-03-13 16:20:19 +01:00
omar	f6fc28dfd2	Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)	2018-03-12 17:50:32 +01:00
omar	e7670c0bcc	Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707)	2018-03-12 11:48:04 +01:00
omar	b9ac127b0b	Internals: Columns renaming fields	2018-03-12 11:03:27 +01:00
omar	5e63711084	Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. (#1542, #1676)	2018-03-12 10:31:39 +01:00
omar	a2fbcc9ad4	Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. (#1542, #1676)	2018-03-12 10:31:39 +01:00
omar	10030ff3ec	Viewport: Fix dropping back viewport not being moved to the front of the window list. (Now that viewport are more tighly coupled to a single root window) (#1542)	2018-03-12 10:31:38 +01:00
omar	648735a4cf	Viewport, DPI: Don't activate current window until a viewport has been selected. At this point we'll have the proper size/scale for the current DPI + fix viewport callback when appending to an existing window more than once a frame. (#1542, #1676)	2018-03-12 10:31:38 +01:00
omar	a4629b0b36	Viewport, DPI: Select viewport before locking style sizes and before handling double-click-on-title-bar to collapse. (#1542, #1676)	2018-03-12 10:31:38 +01:00
omar	64cbbed152	Merge branch 'master' into viewport	2018-03-09 10:41:12 +01:00
omar	43f375b2f2	Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. (#1542)	2018-03-09 10:40:38 +01:00
omar	351b3fa7b0	Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d	2018-03-09 10:29:41 +01:00
omar	4d46383100	Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). (#1542)	2018-03-08 20:27:01 +01:00
omar	a3d5f92214	Merge branch 'master' into font_offset	2018-03-08 16:49:39 +01:00
omar	642c6748ac	Comments, Changelog	2018-03-08 11:15:27 +01:00
omar	9ea16e344a	Viewport: Disable extra viewports from hosting other windows. (#1542)	2018-03-07 16:34:18 +01:00
omar	d8719cf59b	Fixed warnings.	2018-03-07 14:46:53 +01:00
omar	9dcc07422e	Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)	2018-03-07 12:35:26 +01:00
omar	21ff03978a	Viewport: Modal display their darkneing/whitening layer over all viewports. (#1542)	2018-03-07 11:36:37 +01:00
omar	25fd9d6132	Viewport: Various sanity fixes. Popup always inherit viewport from their parent for now. (#1542)	2018-03-07 10:50:30 +01:00
omar	3637193556	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_glfw.h # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h # imgui.cpp	2018-03-06 20:02:40 +01:00
omar	cea7492bab	Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done).	2018-03-05 22:47:53 +01:00
omar	8e3274e137	Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). (#1542)	2018-03-05 22:31:12 +01:00
omar	51afaf7117	Fixed type cast warning.	2018-03-05 13:15:15 +01:00
omar	0ec356eb6e	Comments, FAQ update.	2018-03-05 13:05:47 +01:00
omar	5ed45d0aec	Columns: Fixed destructive small resize. (#1656). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0).	2018-03-04 17:55:59 +01:00
omar	bf7481eba0	Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. (#125). +9 Internal: Store InnerClipRect.	2018-03-04 17:44:17 +01:00
omar	968a8d2a3f	Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. (#125)	2018-03-04 16:58:24 +01:00
omar	ee770af72c	Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. (#125, #1499, #1656)	2018-03-04 16:56:21 +01:00
omar	c4a158656e	Merge branch 'master' into viewport ... # Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx12_example/main.cpp # examples/directx9_example/main.cpp # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_vulkan.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp # imgui.cpp # imgui.h	2018-03-03 23:13:31 +01:00
omar	e026c8d3b7	Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. (#1542)	2018-03-03 22:53:31 +01:00
omar	69e700f869	Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added	2018-03-03 20:15:10 +01:00
omar	8a4093f38b	Added ArrowButton(). Exposed ImGuiDir.	2018-03-03 20:08:03 +01:00
omar	1549c5cf5e	BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.	2018-03-03 19:43:31 +01:00
omar	ad7ff7504e	Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1	2018-03-03 19:34:47 +01:00
omar	839cdd37a3	Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding.	2018-03-03 19:23:48 +01:00
omar	11f13ab24f	Internal: renamed RenderTriangle() to RenderArrow().	2018-03-03 19:08:22 +01:00
omar	e9fa17e1bf	Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)	2018-03-02 22:44:06 +01:00
omar	b807347e94	Viewport: When enabled we assert against using RenderDrawListFn to make user more aware of rendering order. (#1542)	2018-03-02 22:22:14 +01:00
omar	00b9e70ba2	Viewport: Always be lenient with invalid mouse position during dragging, since they are provided by back-end and technically acceptable inputs + comments. (#1542)	2018-03-01 20:19:36 +01:00
omar	6797ee4b68	Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. (#787)	2018-03-01 13:03:12 +01:00
omar	c994796e26	Internal: Moved IM_NEWLINE helper to imgui_internal.h	2018-02-28 21:45:02 +01:00
omar	d98a5d54aa	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)	2018-02-28 19:03:39 +01:00
omar	2c9f45bbe7	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)	2018-02-28 18:51:40 +01:00
omar	735267d27c	Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542)	2018-02-27 23:25:39 +01:00
omar	b5ced477f4	Metrics: Added option to show begin order, useful for debugging.	2018-02-27 23:02:50 +01:00
omar	67319a71e5	Internal: Minor renaming.	2018-02-27 22:58:27 +01:00
omar	184a6f1198	Internals: Moving window: test mouse validity while translating window + using SetWindowPos().	2018-02-27 22:56:22 +01:00
omar	b32bb4e6e3	Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.	2018-02-27 22:55:18 +01:00
omar	0e62b7d68a	Clearing next window data at the end of Begin() more reliably. Misc comments.	2018-02-27 22:47:45 +01:00
omar	a761779b12	Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.	2018-02-27 22:32:45 +01:00
omar	3f335b0d42	Merge branch 'master' into examples_refactor ... # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp	2018-02-26 18:22:36 +01:00
omar	c7835dd189	ImRect: Removed misleading IsFinite() function used by some Nav code.	2018-02-26 16:35:46 +01:00
omar	5427eca960	Compacted some old Breaking Changes notes (Pre July 2015 stuff)	2018-02-25 19:05:31 +01:00
omar	bd267ad739	Changelog: Added all change infos since 1.53 up to the current version.	2018-02-25 14:15:38 +01:00
omar	27667fc035	TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079)	2018-02-25 14:15:37 +01:00
omar	e6bc840f6f	Merge branch 'master' into examples_refactor	2018-02-23 10:47:32 +01:00
omar	8040cf1425	Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master	2018-02-22 23:22:16 +01:00
Podgorskiy	94466745bb	A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call. ... ab_lenSqr -> ab_len_sqr Moved line where ab_len_sqr is computed after the first return	2018-02-22 10:57:20 -05:00
omar	b28995b667	Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h (#1640)	2018-02-22 15:39:49 +01:00
omar	91cadc1130	Merge branch 'master' into examples_refactor	2018-02-21 22:47:03 +01:00
omar	2c3c5125b3	Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. (#143, #1637)	2018-02-21 21:33:58 +01:00
omar	bcdfd5d61c	Merge branch 'master' into examples_refactor	2018-02-20 16:18:02 +01:00
omar	7cbcccd96b	Update Breaking Change section with moved misc/fonts/ (#1631)	2018-02-20 12:08:37 +01:00
omar	7ee2bc8f5e	FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. (#1397)	2018-02-20 10:24:31 +01:00
omar	b33f0e215f	Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization.	2018-02-18 23:28:56 +01:00
omar	45cbebad64	Added dummy io.DisplayPos field.	2018-02-18 21:04:17 +01:00
omar	1399c9c8a9	Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.	2018-02-18 20:21:21 +01:00
omar	bdb27366e7	Nav: Tweak windowing highlighting for full viewport windows.	2018-02-17 00:19:04 +01:00
omar	63332d152a	Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599) ... Examples: Updated examples.	2018-02-16 19:18:16 +01:00
omar	20c14f9589	Fixed GCC zealous warnings (#1623)	2018-02-16 15:43:28 +01:00
omar	1cbfe0700c	Plot: plot a flat line if scale_min==scale_max (#1621)	2018-02-16 14:34:49 +01:00
omar	30c469f7c5	ImFont: DisplayOffset.y defaults to 0 instead of +1.	2018-02-15 10:46:28 +01:00
omar	eb1d481915	Comments (#1230, #1611)	2018-02-12 15:38:04 +01:00
omar	d8d1da27fd	Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master	2018-02-12 15:35:16 +01:00
Randy Gaul	2c4a761982	__cdecl markup for non-standard calling conventions via MSVC	2018-02-12 00:50:40 -08:00
omar	64e0666803	Internals: Moved some of NewFrame() into UpdateMovingWindow().	2018-02-11 22:48:30 +01:00
omar	7cc1bc7635	Added IsAnyMouseDown() helper. ... Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.	2018-02-10 16:50:19 +01:00
omar	3b163ac35b	Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.)	2018-02-08 23:11:51 +01:00
omar	d17d21da1b	Warning fix. (#1565)	2018-02-06 20:21:29 +01:00
omar	7c16d52f72	Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)	2018-02-06 20:20:34 +01:00
omar	f0364aa359	Merge branch 'context' ... # Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx9_example/main.cpp # examples/marmalade_example/main.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp	2018-02-06 20:16:03 +01:00
omar	4e5b7612ae	Nav: Documentation tweaks. (#787)	2018-02-06 20:10:05 +01:00
omar	3171f90a1a	Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787)	2018-02-06 19:54:30 +01:00
omar	7e32fc7109	Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787)	2018-02-06 19:23:12 +01:00
omar	ed4bbc4fd4	Nav: Comments, guides.	2018-02-06 18:48:31 +01:00
omar	cea8017e0b	Merge branch 'master' into context	2018-02-06 18:04:44 +01:00
omar	db071184a0	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-02-06 13:51:09 +01:00
omar	b50dce54ea	Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (#1597, #143)	2018-02-06 13:46:14 +01:00
omar	c6ba7c8231	Internals: TreeNode: Renaming local to be more consistent with other widgets.	2018-02-06 13:41:46 +01:00
omar	e6926d9f7c	Internals: Refactored bool LastItemRectHovered into flags. (#1597)	2018-02-06 13:34:41 +01:00
omar	ce2b8d3255	Nav: Comments, removed extraneous parameter.	2018-02-06 13:16:44 +01:00
omar	0c0d811859	Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787)	2018-02-05 23:53:40 +01:00
omar	fb9fecea5e	Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. (#787)	2018-02-05 20:16:38 +01:00
omar	4932303e62	Nav: DragBehavior: Tweaks (to take the noise out of the next commit).	2018-02-05 20:15:31 +01:00
omar	e5e3cc617e	Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.	2018-02-05 19:37:29 +01:00
omar	fb7cf4a475	Nav: Removed old unnecessary ifdefs.	2018-02-05 18:25:03 +01:00
omar	f35734c925	Nav: Debugging code. (#787)	2018-02-05 17:02:30 +01:00
omar	92ee6b1185	Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787)	2018-02-05 16:07:54 +01:00
omar	348c46d21e	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-02-05 15:50:28 +01:00
omar	11d0fc8220	Tooltip: BeginTooltip() sets NoInputs flag.	2018-02-05 15:10:07 +01:00
omar	1dedbf8091	Style: Fixed missing style.MouseCursorScale initialization (#939), messed up original commit badly.	2018-02-05 15:07:25 +01:00
omar	533fe8cb55	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-02-05 14:55:57 +01:00
omar	8ad88f725c	Nav: Minor tidying up. (#787)	2018-02-05 14:53:22 +01:00
omar	3f297e74e4	Merging the minor/shallow changes from Navigation branch.	2018-02-05 14:52:28 +01:00
omar	2081fc15b5	Added assert in BeginChild(ImGuiId id).	2018-02-05 13:42:34 +01:00
omar	223be68d77	Nav: Debugging stuff.	2018-02-05 13:42:33 +01:00
omar	66ff820eaa	Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. (#787)	2018-02-04 18:30:46 +01:00
omar	0bd15b52a6	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-02-04 13:16:13 +01:00
omar	147ec8d1e2	Style Added style.MouseCursorScale, may remove (#939).	2018-02-04 12:17:35 +01:00
omar	648de2fc00	Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. (#787, #1079)	2018-02-02 18:38:18 +01:00
omar	ce9d7baaba	Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (#787, #1079)	2018-02-02 17:47:05 +01:00
omar	9120938200	Nav: Revert 5c9ea4d53a with comments. (#787)	2018-02-01 23:53:00 +01:00
omar	96ddfbc973	Nav: Modal windows can't be closed with Nav PadCancel. (#787)	2018-02-01 23:36:22 +01:00
omar	efbd8cebe7	Nav: Comments (#787)	2018-02-01 22:53:08 +01:00
omar	c4fc879508	CloseButton: Fixed cross positioning.	2018-02-01 22:33:48 +01:00
omar	942c140710	CloseButton: Fixed cross positioning.	2018-02-01 22:32:52 +01:00
omar	68d3e139a7	Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. (#787)	2018-02-01 22:28:58 +01:00
omar	950f260a32	Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. (#787)	2018-02-01 22:25:25 +01:00
omar	c7b7b181b5	Nav: CloseButton reacts when clipped. (#787)	2018-02-01 22:13:25 +01:00
omar	5c9ea4d53a	Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. (#787)	2018-02-01 21:33:23 +01:00
omar	eb737e0a42	Nav: Child window is restored on focus follow up. Fix bdd868704f. (#787, ~#727) One visible issue was pressing Left to leave a child menu.	2018-02-01 21:27:46 +01:00
omar	95f9c74b9a	Metrics: Displaying some of the important internal window flags.	2018-02-01 21:27:45 +01:00
omar	79ff3c2d49	Merge branch 'master' into navigation	2018-02-01 18:33:40 +01:00
omar	07163804df	Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h	2018-02-01 18:31:41 +01:00
omar	5812d0b751	Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. (#787)	2018-02-01 18:29:30 +01:00
omar	fd6d8863f7	Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). (#787)	2018-02-01 18:19:36 +01:00
omar	ef2c3bcdee	Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). (#787)	2018-02-01 18:02:55 +01:00
omar	8cc2dbc3bd	Internals: Nav: Extracted code into IsWindowNavFocusable(). (#787)	2018-02-01 14:56:56 +01:00
omar	bdd868704f	Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. (#787, vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows.	2018-02-01 00:50:42 +01:00
omar	7b22a91578	Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. (#787)	2018-02-01 00:08:13 +01:00
omar	eaa6f490a2	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2018-01-31 23:38:05 +01:00
omar	9bc5c089b6	Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point.	2018-01-31 23:37:05 +01:00
omar	76d8af4036	Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. (#787)	2018-01-31 21:25:52 +01:00
omar	aa2dda7610	Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.	2018-01-31 21:06:47 +01:00
omar	e6c0b212e8	Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. (#787) ... NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928	2018-01-31 18:53:15 +01:00
omar	9c8fb804ed	Log: Comments and extraneous assets to clarify intent. (#1584)	2018-01-31 17:41:26 +01:00
omar	27980d9688	Merge branch 'master' into context	2018-01-31 16:02:26 +01:00
omar	47e81a6194	Merge branch 'master' into navigation	2018-01-31 16:00:25 +01:00
omar	cd3dd886de	Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)	2018-01-31 16:00:07 +01:00
omar	23c11e9764	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-31 15:43:19 +01:00
omar	596b6d6de2	Style: Enable window border by default. (#707)	2018-01-31 00:03:11 +01:00
omar	bebe03db05	Metrics: Minor formatting tweaks	2018-01-30 21:17:27 +01:00
omar	bd579e5429	Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags.	2018-01-30 20:07:12 +01:00
omar	9fc6f5907b	Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. (#787)	2018-01-30 18:34:32 +01:00
omar	1ed7bce3ed	Nav: Removed old unused code. (#787)	2018-01-30 18:34:17 +01:00
omar	a8763d14c5	Internals: Renaming.	2018-01-30 15:08:53 +01:00
omar	38197a236d	Internals: Renaming.	2018-01-30 15:07:20 +01:00
omar	a7ad5134e5	Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. (#787)	2018-01-30 15:05:46 +01:00
omar	acf21ee429	Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. (#787)	2018-01-30 15:05:32 +01:00
omar	bed6ef03f5	Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. (#787)	2018-01-29 23:59:47 +01:00
omar	c851b33352	Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787)	2018-01-29 23:59:46 +01:00
omar	b40dc5c4f2	Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. (#787)	2018-01-29 23:59:43 +01:00
omar	020b153d35	Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. (#787)	2018-01-29 23:59:43 +01:00
omar	c8d8dc7f0a	Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787)	2018-01-29 23:59:43 +01:00
omar	72485a5d04	Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. (#787) (+1 squashed commits) ... + store window inside result.	2018-01-29 23:59:42 +01:00
omar	1cf38d0334	Internals: Nav: Renamed ImGuiNavForward enum (#787)	2018-01-29 18:12:32 +01:00
omar	4654040bcb	Nav: Comments, added enum to clarify NavForward code. (#787)	2018-01-29 17:35:36 +01:00
omar	c8b9b2c6bd	Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. (#787)	2018-01-29 15:46:41 +01:00
omar	21771adb94	Nav: Debug overlay uses default font. (#787)	2018-01-29 15:35:51 +01:00
omar	3ded262776	Merge branch 'master' into navigation	2018-01-26 16:07:43 +01:00
omar	2d9d7a10ca	Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. (#1574) Looks like a bug introduced in c36e586cce.	2018-01-26 11:43:43 +01:00
omar	1f3b66b10a	Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 (#246) tho at the time it is possible that SizeContents wasn't calculated as evenly. ... Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();	2018-01-26 11:43:31 +01:00
omar	10a4a77b27	Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. (#787)	2018-01-25 20:39:34 +01:00
omar	04d5783ffd	Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787)	2018-01-25 19:36:38 +01:00
omar	d088bd86ad	Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. (#787)	2018-01-25 19:25:30 +01:00
omar	486f0a8ba0	Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)	2018-01-25 19:07:35 +01:00
omar	f2d5300408	Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787)	2018-01-25 19:03:47 +01:00
omar	ed088b00be	Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707)	2018-01-25 18:50:30 +01:00
omar	e9070e768e	Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787)	2018-01-25 16:17:36 +01:00
omar	5d31e1696f	Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. (#1363)	2018-01-25 15:37:24 +01:00
omar	5f7f27c8de	Nav: Comments. (#787)	2018-01-24 20:07:35 +01:00
omar	d404b93b6b	Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments	2018-01-24 19:57:39 +01:00
omar	89b0ca1f8f	Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. (#787)	2018-01-24 19:55:56 +01:00
omar	f3776055d6	Merge branch 'master' into context	2018-01-24 19:31:11 +01:00
omar	455989b8b1	Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787)	2018-01-24 17:41:47 +01:00
omar	28671aa821	Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787)	2018-01-24 17:41:47 +01:00
omar	8227176c17	Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). (#787)	2018-01-24 17:41:47 +01:00
omar	c09016b12a	Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787)	2018-01-24 17:41:47 +01:00
omar	bd278e958e	Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787)	2018-01-24 17:41:47 +01:00
ocornut	680162eb32	Merge branch 'master' into navigation	2018-01-24 17:41:14 +01:00
omar	5148937d4d	Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568)	2018-01-24 17:39:21 +01:00
omar	37ee99983f	Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd (#1567)	2018-01-24 15:09:02 +01:00
omar	64b786c2aa	Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) (#787) ... Note that this bit include badly hardcoded sizes, expecting an improvement later.	2018-01-24 10:31:54 +01:00
omar	cea78cc576	Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. (#787)	2018-01-24 10:24:41 +01:00
omar	eb7ec781dc	Nav: Tweak GetNavInputAmount(). Split debug defines.	2018-01-23 21:56:15 +01:00
omar	f6ee8d30fb	Comments (#1567)	2018-01-23 19:21:17 +01:00
omar	d500113f1d	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2018-01-23 19:16:43 +01:00
omar	9a76fd30fd	Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.	2018-01-23 19:13:49 +01:00
omar	13c407591e	Nav: Comments, tweaks	2018-01-23 16:45:46 +01:00
omar	db2ba13154	Internals: Exposed SetCurrentFont() in imgui_internal.h	2018-01-23 16:33:06 +01:00
omar	9076366c17	Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181)	2018-01-23 09:57:49 +01:00
omar	1acb155419	Internals: Moved unnecessary MovingWindowMoveId field.	2018-01-22 14:31:20 +01:00
omar	5097368bd5	Tweaked FAQ.	2018-01-22 12:01:24 +01:00
omar	2026e792cd	Context: NewFrame() asserts (#1565)	2018-01-21 21:12:52 +01:00
omar	9edf211c0e	Merge branch 'master' into navigation	2018-01-21 20:46:50 +01:00
omar	3ed2ddbfbe	Metrics: Removed context size display.	2018-01-21 20:32:05 +01:00
omar	5e2aa6185c	Reorganized context handling to be more explicit, ... - YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END. - removed Shutdown() function, as DestroyContext() serve this purpose. - you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance. - removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts. - removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts (#1565, #586, #992, #1007, #1558)	2018-01-21 20:16:54 +01:00
omar	7e4d28a49d	Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (#1565, #586, #992, #1007, #1558)	2018-01-21 20:16:54 +01:00
omar	e45d7a7060	Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558)	2018-01-21 20:16:54 +01:00
omar	5a301c29dc	Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558)	2018-01-21 20:16:54 +01:00
omar	ac5b7a1bdf	Comments	2018-01-21 20:10:23 +01:00
Panos Karabelas	7c8a19978d	Simplified return of ImGui::IsKeyReleased()	2018-01-21 16:02:09 +00:00
omar	cd1409f4bf	ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939)	2018-01-20 20:25:12 +01:00
omar	0b1fecb792	Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463)	2018-01-20 12:36:16 +01:00
omar	6f6b6194b2	Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel ... # Conflicts: # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp	2018-01-20 12:06:06 +01:00
omar	d4bf9b4686	Renaming for consistency.	2018-01-19 15:47:10 +01:00
omar	8877622fa8	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-19 15:42:28 +01:00
omar	e5a6e85f6d	Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345)	2018-01-19 15:37:25 +01:00
omar	42a612d7c9	Begin: Removed asserts that got in the way of some flags combination. (#1345)	2018-01-19 15:33:35 +01:00
omar	0978f00911	MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now.	2018-01-19 15:14:53 +01:00
omar	74dc70c543	DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559)	2018-01-19 09:16:26 +01:00
omar	63d47e8328	Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143)	2018-01-18 17:32:34 +01:00
omar	932d3f0198	NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments.	2018-01-18 10:06:58 +01:00
omar	7ccbb765e2	InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554)	2018-01-17 12:15:00 +01:00
omar	2f15cc0855	Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)	2018-01-15 21:55:32 +01:00
omar	05885b2e6d	Merge fix.	2018-01-15 20:18:01 +01:00
omar	472ba1394c	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-15 20:13:42 +01:00
omar	28a76af185	Internal: DrawData: Tidying, renaming.	2018-01-15 20:12:48 +01:00
omar	a77913054f	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-01-15 18:02:58 +01:00
omar	1182174d81	Internals: DrawData: We don't need an intermediate layer for popups.	2018-01-15 18:00:13 +01:00
omar	0c06b43e6b	Metrics: Tweaks to hover-window-drawlist to see window bounding box.	2018-01-15 17:55:38 +01:00
omar	038453258e	Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.	2018-01-15 17:48:32 +01:00
omar	06eef2ce6f	Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).	2018-01-15 17:48:32 +01:00
omar	6eff21ee5e	Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)" ... This reverts commit 03f5cd6ca1.	2018-01-15 16:19:01 +01:00
omar	514d30d8cd	MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.	2018-01-14 14:13:54 +01:00
Crunkle	daa38f2ad0	Fix cross compilers	2018-01-14 03:31:22 +00:00
omar	db63e71f13	Internals: Exposed SetCurrentFont() in imgui_internal.h	2018-01-12 20:07:01 +01:00
omar	1493de4f81	Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.	2018-01-12 19:53:27 +01:00
omar	c85d7d6e49	Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)	2018-01-12 19:28:37 +01:00
omar	c9be7d7254	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-01-12 19:21:12 +01:00
omar	0a98202714	Nav: Standardized FIXME-NAV marker.	2018-01-12 19:13:15 +01:00
omar	cc173d7619	Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)	2018-01-11 23:21:24 +01:00
omar	5e9ae92ae9	Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)	2018-01-11 23:17:34 +01:00
omar	f7b10fc954	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-11 18:18:44 +01:00
omar	6a1011cf53	MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)	2018-01-11 18:16:16 +01:00
omar	b74f24c3e5	Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)" ... This reverts commit 651538e13b.	2018-01-11 18:08:14 +01:00
omar	1c95dea88c	Merge branch 'master' into navigation	2018-01-11 17:37:02 +01:00
omar	7d2a068dea	Begin: Shuffling bits of code around.	2018-01-11 17:33:37 +01:00
omar	cd7e178eac	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-11 16:49:59 +01:00
omar	651538e13b	Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)	2018-01-11 16:43:03 +01:00
omar	a63fbbca8b	Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)	2018-01-11 13:51:18 +01:00
omar	67671c0ab5	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-10 23:11:26 +01:00
omar	1eee10778b	Internals: Begin: Refactor some code into an UpdateManualResize() function.	2018-01-10 23:06:51 +01:00
omar	483f9b0d07	Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.	2018-01-10 22:55:29 +01:00
omar	03f5cd6ca1	Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)	2018-01-10 18:58:55 +01:00
omar	919fc548ad	Merge branch 'master' into navigation	2018-01-10 18:58:26 +01:00
omar	6c583315e6	Begin: Moving some code around for the benefits of the wip viewport branch.	2018-01-10 18:56:51 +01:00
omar	f610e25682	Internals: Using ImFloor().when appropriate.	2018-01-10 18:33:29 +01:00
omar	fe919995da	Merge branch 'master' into navigation	2018-01-08 16:35:12 +01:00
omar	933ee6cd5d	InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)	2018-01-08 16:01:30 +01:00
omar	fd4d63a0c5	InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)	2018-01-08 15:56:01 +01:00
omar	168200f915	Popups: Comments, reorganize bits of the header section, renamed parameters.	2018-01-07 18:17:47 +01:00
omar	a8e5542d78	BeginPopup: Exposed extra_flags publicly. (#1533)	2018-01-07 18:13:01 +01:00
omar	3f4eccf154	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-07 16:22:09 +01:00
omar	3fc7cf190d	OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)	2018-01-07 16:20:02 +01:00
omar	deab2ab015	Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)	2018-01-07 16:15:54 +01:00
omar	69ff65f054	Internals: Popup: Renaming fields.	2018-01-07 16:11:25 +01:00
omar	3678307cd9	Popup, Menus: Tweaks and comments.	2018-01-07 15:56:14 +01:00
omar	369189b675	Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.	2018-01-07 15:40:46 +01:00
omar	e09852fc49	Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)	2018-01-07 15:34:15 +01:00
omar	63e4677b81	Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)	2018-01-07 15:23:57 +01:00
omar	c337cdcfd3	Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently	2018-01-07 15:02:09 +01:00
omar	7ad169fa09	Merge branch 'master' into navigation + fix previous merge ... # Conflicts: # imgui.cpp	2018-01-07 14:33:44 +01:00
omar	d730a763f6	Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.	2018-01-07 14:32:42 +01:00
omar	66b2ee6ea2	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-07 14:25:05 +01:00
omar	a34490239c	Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.	2018-01-07 14:03:56 +01:00
omar	5fd19f037f	Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()	2018-01-07 12:48:11 +01:00
omar	2874aabb93	Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.	2018-01-07 12:48:11 +01:00
omar	95b773370f	Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later. ... This reverts commit 007f4034c9.	2018-01-05 17:40:51 +01:00
omar	007f4034c9	Internals: Added LastActiveId, LastActiveIdTimer. (#1537)	2018-01-05 15:33:24 +01:00
omar	29c194b2a4	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-03 20:47:42 +01:00
omar	4fc9f44073	Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.	2018-01-03 20:46:54 +01:00
omar	4b1240b2e1	Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.	2018-01-03 20:45:24 +01:00
omar	b2ec0741f1	Internals: Settings api tweaks	2018-01-03 20:45:17 +01:00
omar	2b8224692e	Merge branch 'master' into navigation	2018-01-03 20:26:24 +01:00
omar	0a0b252bb6	DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.	2018-01-03 17:02:51 +01:00