870 Commits

Author	SHA1	Message	Date
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	16285603f2	Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)	2018-01-12 19:11:11 +01:00
omar	919fc548ad	Merge branch 'master' into navigation	2018-01-10 18:58:26 +01:00
omar	0cabd81071	Internals: Rect: Added ClipWillFull helper + comments on variations.	2018-01-10 14:43:08 +01:00
omar	92d75c44bc	Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.	2018-01-10 14:43:02 +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	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	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	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	f9b2058d5a	Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).	2018-01-03 14:35:11 +01:00
omar	96ccc484f9	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2018-01-03 12:33:27 +01:00
omar	3c6fbe0849	Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.	2018-01-03 12:31:56 +01:00
omar	7fcbd45500	Internals: NextWindow: Renamed, moved functions to member.	2018-01-03 12:28:16 +01:00
omar	e339949de1	Internals: NextWindow: Using ImGuiCond for consistency.	2018-01-03 12:22:02 +01:00
omar	04b44398eb	Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)	2018-01-03 12:12:41 +01:00
omar	7a15fc8de5	Merge branch 'master' into navigation	2017-12-29 18:28:23 +01:00
omar	6ec00a366a	Internals: ImRect: Minor formatting tweaks.	2017-12-29 18:28:04 +01:00
omar	fbf2435f38	Exposed IM_OFFSETOF() helper in imgui.h	2017-12-29 18:16:19 +01:00
omar	2dd2ca0096	Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side. ... Removed internal corresponding ImRect::GetClosestPoint() for now. Essentially revert dcaafffe0e.	2017-12-29 17:59:13 +01:00
omar	c4e6d622c1	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-12-29 13:39:07 +01:00
omar	49eed6e2d1	Version 1.54 WIP	2017-12-28 15:17:35 +01:00
omar	436cad4bca	Merge branch 'master' into navigation ... # Conflicts: # imgui.h	2017-12-26 15:37:31 +01:00
omar	e916310b2e	Version 1.53	2017-12-25 17:41:41 +01:00
omar	67191badc2	Merge branch 'master' into navigation	2017-12-23 23:10:41 +01:00
omar	bb8dfe4a34	Fixed incorrect IM_DELETE macro (9cda86d55a) (#1517, #484, #504)	2017-12-23 23:10:26 +01:00
omar	ffb4f6ca8c	Merge branch 'master' into navigation	2017-12-23 16:27:48 +01:00
omar	9cda86d55a	Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)	2017-12-23 16:24:33 +01:00
omar	1f26652944	Various zealous warning fixes (thanks Clang).	2017-12-23 14:07:03 +01:00
omar	287380261c	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-21 19:55:21 +01:00
omar	c8c872c753	Internals: String functions uses size_t in their signature	2017-12-21 19:49:54 +01:00
omar	531c11d5c7	ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.	2017-12-21 18:52:34 +01:00
omar	4c2514dc29	Merge branch 'master' into navigation	2017-12-21 11:18:42 +01:00
omar	b9391d1692	Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)	2017-12-15 17:06:47 +01:00
omar	cc3192f347	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-12-13 22:09:08 +01:00
omar	ddbcda8c1b	Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)	2017-12-13 21:51:23 +01:00
omar	e8e84a6ad6	Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)	2017-12-13 19:26:04 +01:00
omar	4ae5c7e227	Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)	2017-12-13 19:21:21 +01:00
omar	b016215c80	Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)	2017-12-13 19:07:09 +01:00
omar	3a31a75e3b	Columns: Refactor: Renamed all members. (#125, #1499)	2017-12-13 18:42:06 +01:00
omar	78320aa633	Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)	2017-12-13 18:41:51 +01:00
omar	16fb58984f	Merge branch 'master' into navigation	2017-12-12 23:41:48 +01:00
omar	90d0b8b58b	Navigation: minor sync to reduce drifts between changes	2017-12-12 23:41:20 +01:00
omar	8b59ed0708	Drag and Drop: Exposed some internals.	2017-12-12 23:37:27 +01:00
omar	7c7a7baf76	Merged miscellaneous small stuff (from nav/dock branches).	2017-12-12 23:36:25 +01:00
omar	fa9327ccf8	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_draw.cpp # imgui_internal.h	2017-12-12 20:44:12 +01:00
omar	d0a1be0de0	Merge branch 'drag_and_drop'	2017-12-12 20:39:52 +01:00
omar	3ea5e67ba2	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-12-12 18:47:23 +01:00
omar	28bbf1ade6	Fixed ParentWindow setup which broke Modal windows (fix c65124f415)	2017-12-12 18:45:57 +01:00
omar	052b6021dd	Merge branch 'master' into drag_and_drop ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2017-12-12 15:02:05 +01:00
omar	0a3db267c3	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2017-12-12 14:58:53 +01:00
omar	c22657985a	Added GetFrameHeight() function (used to be SmallSquareSize internally)	2017-12-12 14:12:49 +01:00
omar	ee7f1921e8	Internals: Added GetSmallSquareSize()	2017-12-12 14:08:58 +01:00
omar	c65124f415	Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.	2017-12-12 12:50:43 +01:00
omar	f42d7b89e2	Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.	2017-12-12 12:50:42 +01:00
omar	4a555d35f0	IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)	2017-12-12 12:50:42 +01:00
omar	45f440bb7d	Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap	2017-12-11 22:39:10 +01:00
omar	2b9d8ab91d	Merge branch 'master' into drag_and_drop ... # Conflicts: # imgui.cpp # imgui.h	2017-12-11 16:39:27 +01:00
omar	d1db229907	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2017-12-10 19:01:59 +01:00
omar	e3e0326ea9	Exposed BeginCombo() publicly.	2017-12-10 18:08:59 +01:00
omar	eab6333a0b	SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) (#1490)	2017-12-10 17:36:30 +01:00
omar	a6f37287d8	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-08 15:06:37 +01:00
omar	a5e9392140	Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.	2017-12-08 15:03:26 +01:00
omar	7bf85db6c4	Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)	2017-12-08 12:48:53 +01:00
omar	553b0fcf8f	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-07 21:20:16 +01:00
omar	45466a8cf9	Internals: BeginCombo() added dummy ImGuiComboFlags.	2017-12-07 21:14:41 +01:00
omar	e6215b6ca0	Merge branch 'master' into navigation + merge fix ... # Conflicts: # imgui.cpp	2017-12-07 16:42:52 +01:00
omar	8959c64b33	Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended	2017-12-07 13:29:14 +01:00
omar	2fc6a82665	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-12-06 17:44:40 +01:00
omar	beda5fc5a0	Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.	2017-12-06 15:13:45 +01:00
omar	e103fe8c1f	Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)	2017-12-06 15:13:45 +01:00
omar	729333293c	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-12-05 22:56:35 +01:00
omar	b9dc0caee3	Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)	2017-12-05 22:44:52 +01:00
omar	364251146b	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-05 16:15:05 +01:00
omar	16d9fa30b2	Merge branch 'master' into drag_and_drop	2017-12-05 09:21:07 +01:00
omar	c860a0a85c	Internals: ImRect: Added IsFinite() helper.	2017-12-01 17:39:13 +01:00
omar	81cbaef806	Merge branch 'master' into navigation	2017-11-29 23:49:17 +01:00
omar	52e475230f	Settings: Internals: Renaming.	2017-11-28 23:16:09 +01:00
omar	7ae71e4984	Settings: Internals: Added FindSettingsHandler()	2017-11-28 21:04:38 +01:00
omar	35eb5c5c99	Settings: Internals: Exposed FindWindowSettings(). Simplified some code.	2017-11-28 21:04:38 +01:00
omar	963259d128	Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.	2017-11-28 21:04:38 +01:00
omar	63712d5f5c	Merge branch 'master' into drag_and_drop	2017-11-28 17:28:45 +01:00
omar	9191b17218	Merge branch 'master' into navigation	2017-11-28 17:28:08 +01:00
omar	f3ec608c19	Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h	2017-11-28 10:49:43 +01:00
omar	7e2d0d734c	Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.	2017-11-27 23:57:11 +01:00
omar	d552cabd15	Settings: Internal renaming of structure and fields names.	2017-11-27 23:57:10 +01:00
omar	4e3c7f1557	Nav: Exposed NavInitWindow() in imgui_internal (#787)	2017-11-24 16:55:49 +01:00
omar	7763ab3fcc	Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.	2017-11-22 15:58:20 +01:00
omar	b618629d99	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-11-22 12:34:59 +01:00
omar	7d09a0ae99	Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.	2017-11-22 12:33:59 +01:00
omar	68b26b4867	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-11-22 11:04:00 +01:00
omar	302757447a	Internals: Added SplitterBehavior(). (#319)	2017-11-20 19:41:17 +01:00
omar	2543807e56	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-11-20 13:54:06 +01:00
omar	3f5b2a3fe3	Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).	2017-11-20 13:53:16 +01:00
thedmd	8b2d449b16	Add ShadeVertsLinearUV()	2017-11-19 21:56:36 +01:00
omar	92212b17aa	Merge branch 'master' into drag_and_drop	2017-11-19 16:23:37 +01:00
omar	9848a7023b	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-11-19 16:21:21 +01:00
omar	9a44d447cd	NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)	2017-11-19 12:06:45 +01:00
omar	d211a0e338	Merge branch 'master' into navigation (with style breakable) ... # Conflicts: # imgui.cpp # imgui_draw.cpp	2017-11-19 00:39:37 +01:00
omar	4022ada843	Merge branch 'master' into drag_and_drop	2017-11-19 00:36:32 +01:00
omar	6f7b1bf2e1	Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.	2017-11-19 00:29:29 +01:00
omar	29e0078b66	Internals: Window minor internal renaming + added WindowRounding latch.	2017-11-18 19:06:11 +01:00
omar	834fa52c8e	Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. (#1444, #125)	2017-11-16 17:34:34 +01:00
omar	7746dd104c	Merge branch 'master' into drag_and_drop	2017-11-16 13:28:22 +01:00
omar	44c590393c	Merge branch 'master' into navigation	2017-11-16 13:28:10 +01:00
omar	4ad414c8d4	Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)	2017-11-16 13:23:50 +01:00
omar	7c4be0a000	Internals: Added BringWindowToFront(), BringWindowToBack() helpers.	2017-11-16 13:11:49 +01:00
omar	5027311e7f	Drag and drop: Standardizing payload types as defines. (#143)	2017-11-15 22:23:21 +01:00
omar	ae060b1d67	Merge branch 'master' into drag_and_drop	2017-11-15 10:24:54 +01:00
omar	2275cb8b83	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-11-13 15:19:43 +01:00
omar	3e06450d27	Internals: Added ArrowButton() helper.	2017-11-13 15:18:31 +01:00
omar	7908cce25f	Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. (#143)	2017-11-13 15:17:41 +01:00
omar	a297cbafdb	Merge branch 'master' into navigation	2017-11-08 23:17:14 +01:00
omar	b6504b8eee	Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.	2017-11-08 15:47:52 +01:00
omar	aae52522c3	Internals: Remove requirement to define IMGUI_DEFINE_PLACEMENT_NEW (#1103)	2017-11-07 14:06:02 +01:00
omar	571b08f315	Internal: FindWindowByName() faster and doesn't touch every windows	2017-11-07 13:59:55 +01:00
omar	de1e7dc088	Drag and Drop: Moved internal fields out of public sight. (#143)	2017-11-06 20:04:10 +01:00
omar	66f42324ad	Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.	2017-11-01 17:25:42 +01:00
omar	63f6f2dd13	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-11-01 15:09:23 +01:00
omar	a810619555	Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!	2017-10-30 00:03:04 +01:00
omar	1d7d8f8574	Merge branch 'master' into drag_and_drop	2017-10-29 23:49:24 +01:00
omar	b13d281356	Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)	2017-10-29 23:49:01 +01:00
omar	0e775807b4	Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.	2017-10-29 23:10:44 +01:00
omar	acf78da742	Drag and drop: moved to imgui.h	2017-10-29 21:37:14 +01:00
omar	b5f714e9f9	Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.	2017-10-29 21:31:49 +01:00
omar	c5536e49ef	Drag and drop API experiment	2017-10-29 21:15:02 +01:00
omar	edafbcd630	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-10-27 20:04:51 +02:00
omar	77df1ba9e0	Version 1.53 WIP	2017-10-27 19:54:56 +02:00
omar	c0b366b316	Merge branch 'master' into navigation ... # Conflicts: # imgui.h	2017-10-27 17:27:53 +02:00
omar	9f200d10d5	Version 1.52	2017-10-27 17:10:41 +02:00
omar	5afee1c6f3	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-10-27 16:42:06 +02:00
omar	8dd7648db2	Comments	2017-10-27 16:41:22 +02:00
omar	ccdb58b17e	Internal: Added ImVec4 operators	2017-10-27 16:40:04 +02:00
omar	6243252d5a	Internal: BeginTooltipEx() in imgui_internal.h	2017-10-27 16:21:12 +02:00
omar	f10a1d7b9e	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-10-27 15:53:59 +02:00
omar	d42f6bb6cc	Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)	2017-10-27 15:52:45 +02:00
omar	c432fcf2bb	Minor renaming.	2017-10-27 12:01:52 +02:00
omar	a6ff14d66e	Exposed IM_ARRAYSIZE() in imgui.h	2017-10-26 16:12:53 +02:00
omar	549f9e3f03	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-10-25 16:37:10 +02:00
omar	4faf99eff5	Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported (#211, #1012)	2017-10-25 09:28:54 +02:00
omar	d513546325	Merge branch 'master' into navigation	2017-10-24 15:49:01 +02:00
omar	de72e9cc87	Internals: ImLerp() helper for ImVec4	2017-10-23 17:22:00 +02:00
omar	20983773f1	Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. (#787) ... This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right	2017-10-23 12:38:39 +02:00
omar	d29a6a5a5a	Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.	2017-10-20 17:29:52 +02:00
omar	51eed2f257	Merge branch 'master' into navigation	2017-10-19 19:42:27 +02:00
omar	5b699517d4	Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)	2017-10-19 19:42:19 +02:00
omar	d3c2e904d8	Internals: Added ImLinearSweep() helper.	2017-10-19 19:29:59 +02:00
omar	938f1b720f	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-10-19 00:04:53 +02:00
omar	370a48c10b	Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir	2017-10-18 23:46:16 +02:00
omar	a03093b2d4	CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787)	2017-10-18 19:55:08 +02:00
omar	29a652adee	CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787)	2017-10-18 19:51:32 +02:00
omar	a126c702d9	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-10-18 13:09:28 +02:00
omar	ef3f87eec5	Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.	2017-10-18 13:08:25 +02:00
omar	1c4af303bf	Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy().	2017-10-18 13:08:14 +02:00
omar	bf778ebb7e	Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.	2017-10-18 13:06:49 +02:00
omar	78a85ba3fe	Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)	2017-10-17 16:15:46 +02:00
omar	2739b6ebcd	Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)	2017-10-17 16:14:20 +02:00
omar	4aa9d2089d	Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)	2017-10-17 15:51:20 +02:00
omar	55d873875e	Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)	2017-10-17 15:47:55 +02:00
omar	d761825cfb	Nav: Renaming a field + Comments.	2017-10-15 17:57:15 +02:00
omar	c42baf392a	Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.	2017-10-13 16:48:14 +02:00
omar	f852b9a52a	Exposed Scrollbar() in imgui_internal.h and removed a bool arg	2017-10-13 13:31:34 +02:00
omar	b667d5a9e7	Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() (#787)	2017-10-13 13:31:34 +02:00
omar	0371219222	Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. (#787) ... May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().	2017-10-13 13:31:34 +02:00
omar	4be967823f	Exposed Scrollbar() in imgui_internal.h and removed a bool arg	2017-10-13 13:30:28 +02:00
omar	7a14d7dfdc	Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. (#787)	2017-10-11 19:05:36 +02:00
omar	69dd895358	Nav: Renaming NavInitDefaultRequest -> NavInitRequest	2017-10-06 15:54:29 -07:00
omar	d2975115cd	Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)	2017-10-06 15:14:28 -07:00
omar	c3105919ba	Nav: Minor tweaks also toward removing processing from ItemAdd()	2017-10-06 14:51:15 -07:00
omar	64ce83b9ed	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-10-06 14:27:29 -07:00
omar	042153d254	Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter	2017-10-06 14:23:18 -07:00
omar	59c6f35bf6	Added ActivateItem(), GetItemID() functions.	2017-10-05 21:34:01 -07:00
omar	80c4e2fe7b	Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.	2017-10-05 21:27:08 -07:00
omar	2f27b733be	Nav: Fixed uninitialized context variables for sanity.	2017-10-05 18:33:40 -07:00
omar	f2c9bd8d4f	Nav: Fixed uninitialized context variables for sanity.	2017-10-05 16:39:59 -07:00
omar	f326fac64a	Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). (#787)	2017-10-05 10:29:17 -07:00
omar	42ee537be3	Comments	2017-10-04 10:45:35 -07:00
omar	a56b71e866	Nav: Added code to render thin highlight type. (#787)	2017-10-04 10:44:27 -07:00
omar	64a51327d3	Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) (#787)	2017-10-03 13:25:40 -07:00
omar	74da533c93	Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) (#787)	2017-10-03 11:22:38 -07:00
omar	88a354585a	Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. (#787, #126) ... Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)	2017-09-29 23:39:34 +02:00
omar	587e637db0	Nav: Taking note that we should aim to remove MenuBarAppending later.	2017-09-29 23:37:14 +02:00
omar	1eaa9d0621	Nav: Fixed uninitialized variable (that had no side-effects due to the code/data flow involved)	2017-09-29 23:37:14 +02:00
omar	8a5a29f0be	Nav: Renamed internal field.	2017-09-29 19:28:19 +02:00
omar	9712a81f85	Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.	2017-09-29 19:26:03 +02:00
omar	9737efb2f1	Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. (#787)	2017-09-29 17:58:25 +02:00
omar	8a814487fe	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-29 16:30:43 +02:00
omar	30b1d85962	Nav: Commiting some better organized Debug helper because this going to stay for a bit.	2017-09-28 23:48:30 +02:00
omar	164f22d5b7	Comments	2017-09-28 22:00:49 +02:00
omar	df366b230e	ColorPicker4: Use nav flag to provide a slighly better experience when using navigation (#787, #346)	2017-09-28 20:22:30 +02:00
omar	2d859dee4e	Nav: Added ImGuiItemFlags_NoNav item flag	2017-09-28 19:58:01 +02:00
omar	4b4e455c40	Nav: Internal nenaming	2017-09-28 19:41:30 +02:00
omar	50ba543743	Comments	2017-09-28 19:35:10 +02:00
omar	e0a2a832cd	Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent (#787)	2017-09-28 19:18:41 +02:00
omar	ca4db8c905	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-28 17:40:25 +02:00
omar	926c1cf9a4	Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag	2017-09-28 17:02:28 +02:00
omar	f99348711b	Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.	2017-09-28 16:41:01 +02:00
omar	d394c7ad0b	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-28 15:45:35 +02:00
omar	0106dcbd02	Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.	2017-09-28 15:43:26 +02:00
omar	35f65e05ed	Merge branch 'master' into navigation	2017-09-28 00:33:29 +02:00
omar	fafe65a8fc	Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.	2017-09-28 00:21:47 +02:00
omar	7bcb1d3816	Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this	2017-09-27 22:59:40 +02:00
omar	cc26db8ec7	Merge branch 'master' into navigation	2017-09-27 17:25:50 +02:00
omar	0adcddac39	IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.	2017-09-27 17:21:50 +02:00
omar	99c7622a1b	ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().	2017-09-27 16:20:53 +02:00
omar	a2b2e56e8e	Merge branch 'master' into navigation	2017-09-27 12:31:12 +02:00
omar	8374a454da	Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.	2017-09-27 11:39:13 +02:00
omar	8fd4beddb8	Merge branch 'master' into navigation	2017-09-26 20:28:40 +02:00
omar	072d6d8cb5	ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)	2017-09-26 19:26:16 +02:00
omar	f1a20ec66d	Merge branch 'master' into navigation	2017-09-26 16:54:37 +02:00
omar	be03882a15	Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.	2017-09-26 15:43:48 +02:00
omar	69d0d33451	Exposed PushMultiItemsWidths() to imgui_internal.h	2017-09-25 22:45:10 +02:00
omar	7e8069dd23	Merge branch 'master' into navigation	2017-09-25 22:08:38 +02:00
omar	0d56140b4a	BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo(). ... BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.	2017-09-25 21:45:34 +02:00
omar	4b82759598	SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well. ... Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.	2017-09-25 18:25:43 +02:00
omar	0a5fb24f10	Popups: Exposing a little more of popups internals in imgui_internals.h	2017-09-25 12:52:06 +02:00
omar	44e8d94aba	Merge branch 'master' into navigation	2017-09-18 15:32:31 +02:00
Bruce Mitchener	2fcdeb7f12	Remove commas after last item in enumeration. ... This brings these enums to match the rest of the code and fixes 2 warnings under clang about using C++11 extensions.	2017-09-14 10:35:30 +07:00
omar	66a9d4856c	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-09-06 20:37:29 +02:00
omar	cb2775ae54	Internals: ImGuiItemFlags comments	2017-09-06 20:36:36 +02:00
omar	62d7fa4324	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-06 20:33:39 +02:00
omar	f63c03c464	Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.	2017-09-06 20:28:36 +02:00
omar	5c4fda0fbc	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-06 19:17:51 +02:00
omar	2169bf6895	Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317)	2017-09-06 17:25:36 +02:00
omar	790605e359	Minor comments + renaming internal fields	2017-09-06 17:20:54 +02:00
omar	e8dbf1c795	Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.	2017-09-01 22:10:13 +02:00
omar	804ee78731	Added IsWindowAppearing().	2017-09-01 21:55:59 +02:00
omar	ddf41b0398	Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.	2017-08-29 17:27:19 +08:00
omar	358e7a194e	Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.	2017-08-29 16:13:17 +08:00
omar	ee42fae468	Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787)	2017-08-29 16:05:12 +08:00
omar	2ee1b70652	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-08-29 15:36:36 +08:00
omar	01d4bf299a	Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76)	2017-08-29 15:22:30 +08:00
omar	7a9ea281be	ImSwap() helper.	2017-08-28 19:27:12 +08:00
omar	1f51e8f39d	Internals: Renamed some ImGuiCorner enums.	2017-08-28 14:11:11 +08:00
omar	807322c9a5	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-08-26 18:43:10 +08:00
omar	419b22a487	Internals: Split some code out of NewFrame() into an Initialize() function.	2017-08-26 16:35:39 +08:00
omar	f72ca6d22c	ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)	2017-08-26 14:11:56 +08:00
omar	37f3a718c6	Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.	2017-08-25 16:10:14 +08:00
omar	40f608ce9b	Version 1.52 WIP	2017-08-25 15:12:12 +08:00
omar	55a6209931	Version 1.51	2017-08-25 00:29:59 +08:00
omar	141339e4b7	(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch	2017-08-22 19:51:12 +08:00
ocornut	2ad2190d47	Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)	2017-08-22 19:47:52 +08:00
omar	bea06117bb	Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291)	2017-08-22 19:26:21 +08:00
ocornut	50b3a14d0a	Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h	2017-08-22 18:26:27 +08:00
omar	d5b0d51274	Minor miscellaneous merges from Navigation branch to reduce divergence a little bit	2017-08-22 18:13:10 +08:00
omar	9670fe9ca7	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-08-22 17:51:20 +08:00
omar	6ee317d26d	ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.	2017-08-22 17:46:50 +08:00
omar	53e73182ff	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-08-21 00:04:45 +08:00
omar	530baee1a7	Removed tabs that slipped through the cracks	2017-08-21 00:03:37 +08:00
omar	067127f113	Columns: Caching columns clipping rectangles (#125)	2017-08-20 23:17:59 +08:00
omar	adeaf1cd72	Columns: Moved PushColumnClipRect() to imgui_internal.h	2017-08-20 23:09:43 +08:00
omar	1c83b073c6	Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913)	2017-08-20 20:58:23 +08:00
omar	7f0063f858	Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125)	2017-08-20 19:32:50 +08:00
omar	19a42cb2fd	Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)	2017-08-20 18:44:48 +08:00
omar	bc78535bbf	Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master ... # Conflicts: # imgui.cpp # imgui.h	2017-08-20 18:22:34 +08:00
omar	bf0d9c123e	Merge branch 'master' into navigation	2017-08-18 00:25:12 +08:00
omar	8be7a60f20	ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)	2017-08-17 21:19:54 +08:00
omar	1086c87767	ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)	2017-08-17 21:13:14 +08:00
omar	4075cc58e9	ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)	2017-08-17 20:44:44 +08:00
omar	a85a14370b	OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.	2017-08-16 15:47:10 +08:00
omar	d2259f65e5	Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)	2017-08-16 13:42:41 +08:00
omar	e682362f35	TODO list update, comments	2017-08-16 12:54:51 +08:00
omar	73f9c9d80c	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-08-11 13:44:25 +08:00
omar	7e452ec737	Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS	2017-08-11 13:36:28 +08:00
omar	30d1e5712a	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2017-08-08 17:30:32 +08:00
omar	942cb0e1f2	Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)	2017-08-08 15:54:20 +08:00
omar	03700ad15e	Merge remote-tracking branch 'origin' into 2016-07-navigation	2017-08-07 22:51:18 +08:00
omar	fb54dce71c	Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&	2017-07-31 21:11:41 +08:00
omar	1a26d0bc98	Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.	2017-07-31 18:56:51 +08:00
omar	72da4081f8	Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.	2017-07-31 17:54:40 +08:00
omar	390188dfa9	Comments about parts of imgui_internal.h that will self-destruct.	2017-07-30 16:16:06 +08:00
omar	fef8aac523	ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)	2017-07-30 16:15:52 +08:00
omar	7537dff806	ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code (#346)	2017-07-29 15:54:45 +08:00
omar	bfec9c657e	ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. (#346)	2017-07-27 16:26:32 +08:00
omar	69dd1ed583	RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)	2017-07-26 22:20:43 +08:00
omar	19c6a9c0e0	ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments	2017-07-26 17:38:33 +08:00
omar	78a8f798c5	ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)	2017-07-26 15:24:09 +08:00
omar	a8b202782f	ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)	2017-07-22 19:37:13 +08:00
omar	15be7e1a71	ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h (#346)	2017-07-22 18:01:16 +08:00
omar	c8553817d9	Merge branch 'master' into 2016-02-colorpicker	2017-07-21 02:34:19 +08:00
omar	138a9dbaeb	Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862)	2017-07-21 02:21:48 +08:00
omar	85d9c8fb46	Internals: renaming IndexWithinParent to OrderWithinParent	2017-07-20 21:25:31 +08:00
omar	3e4cb40d45	Merge branch 'master' into 2016-02-colorpicker	2017-07-19 14:53:25 +08:00
omar	12d265fa31	Version 1.51 WIP tag	2017-06-13 11:30:22 +02:00
omar	5e1caaaef3	Version 1.50	2017-06-02 12:22:34 +02:00
omar	2a3c61e5f8	Merge branch 'master' into 2016-07-navigation	2017-03-16 19:31:12 +01:00
omar	92ea8d1131	Merge branch 'master' into 2016-02-colorpicker	2017-03-16 19:28:30 +01:00
omar	b8043d3ee5	Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917)	2017-01-14 13:47:16 +01:00
omar	b6c0227add	Merge branch 'master' into 2016-02-colorpicker	2017-01-11 21:03:35 +01:00
omar	c76be71acf	Merge branch 'master' into 2016-07-navigation	2017-01-11 21:03:25 +01:00
omar	6257b5814a	Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),	2017-01-11 20:56:55 +01:00
ocornut	3028ccc25b	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-11-27 18:25:20 +01:00
ocornut	f4cf972ea9	Merge branch 'master' into 2016-02-colorpicker	2016-11-27 18:21:14 +01:00
ocornut	104b381023	Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). (#917)	2016-11-27 16:43:36 +01:00
Geoffrey Tucker	66c4281290	Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.	2016-11-13 23:58:09 -08:00
ocornut	1a0e414d3a	Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).	2016-11-12 21:17:30 +01:00
ocornut	98e1d500d4	Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery (#586)	2016-11-12 17:08:31 +01:00
ocornut	dd6163241c	Merge branch 'master' into 2016-02-colorpicker	2016-10-16 14:02:15 +02:00
ocornut	bdb34d1c11	Merge branch 'master' into 2016-07-navigation	2016-10-16 14:01:13 +02:00
ocornut	1810b3ff38	Added ImGuiCorner enum to clarify some internal code	2016-10-09 10:56:23 +02:00
ocornut	abaada4224	Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)	2016-10-09 10:31:39 +02:00
ocornut	404979e48d	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-10-07 09:52:00 +02:00
ocornut	fea0fcb7c3	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 15:25:55 +02:00
ocornut	f2699de242	Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479)	2016-09-25 14:18:10 +02:00
ocornut	ed279c0095	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 12:59:24 +02:00
ocornut	1b5bbf725b	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-09-25 12:57:22 +02:00
ocornut	56cdbe434d	Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842)	2016-09-25 12:53:13 +02:00
ocornut	0f303d363a	Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842, #222)	2016-09-25 12:19:15 +02:00
ocornut	de9f8944ea	Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*	2016-09-25 11:38:04 +02:00
ocornut	c5b8c6303a	Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842)	2016-09-25 11:06:14 +02:00
ocornut	b397fb507e	Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829)	2016-09-13 09:18:17 +02:00
ocornut	ac7826c8a5	ImRect: Added Translate() helper, removed redundant and misleading Reduce()	2016-08-21 14:37:48 +02:00
ocornut	ea2425ad9a	Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav (#323)	2016-08-21 12:44:59 +02:00
ocornut	695ca7bb45	Nav: Tidying up. Comments. (#323)	2016-08-20 23:27:25 +02:00
ocornut	cf16ba6572	Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent (#323)	2016-08-15 11:52:02 +02:00
ocornut	996eb080fa	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-11 22:53:26 +02:00
ocornut	8828889d5e	Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup (#323)	2016-08-07 20:05:24 +02:00
ocornut	cbf24c13ca	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-08-07 12:15:21 +02:00
ocornut	a7f6ea592f	Moved GetColorU32 out of imgui_internal.h to avoid inlining mess (#759)	2016-08-06 09:22:41 +02:00
ocornut	dcff032429	Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. (#323)	2016-08-03 23:23:04 +02:00
ocornut	e9c881e4de	Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code (#323)	2016-07-31 16:07:58 +02:00
ocornut	08a28c16ae	Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point (#323)	2016-07-31 13:38:57 +02:00
ocornut	2545d75c3b	Tidying up, removed two unnecessary window flags from being exposed in imgui.h	2016-07-31 13:05:13 +02:00
ocornut	b3cba62b80	Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows (#323)	2016-07-31 12:55:23 +02:00
ocornut	f72e2fd1b1	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-07-30 23:46:09 +02:00
ocornut	954c890c67	SameLine() with explicit X position is relative to left of group/columns (ref #746, #125, #630)	2016-07-30 23:41:44 +02:00
ocornut	e2dd48ae65	Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus (#323)	2016-07-30 18:06:05 +02:00
ocornut	04157da291	Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) (#323)	2016-07-30 17:18:34 +02:00
ocornut	4309b8c1ed	Clarifying that MovedWindow* apply to mouse moving only	2016-07-30 16:25:45 +02:00
ocornut	efc8858328	ImRect: fixed Clip() function being the other way around (INTERNAL API BREAKING CHANGE- wasn't exposed, hoping nobody uses that) + actually fixes the function behavior.	2016-07-30 14:38:33 +02:00
ocornut	d6ce800a20	Nav: ActiveIdAllowNavMove -> ActiveIdAllowNavDirFlags for more flexibility (nav up/down typically allowed on a single-line text input) (#323)	2016-07-30 14:31:34 +02:00
ocornut	d9d6b0e629	Nav: Renamed private ImGuiNavDir_ enum to use left/right/up/down to be consistent with key enums (#323)	2016-07-30 13:45:46 +02:00
ocornut	b2aaab873d	Nav: collapse button is interactve, allow collapsing, tidying up, resize speed takes account of framebuffer scale (#323)	2016-07-30 10:56:52 +02:00
ocornut	20a0fde012	Tidying up default clipboard handler for non Windows-OS	2016-07-30 10:02:46 +02:00
ocornut	aeabda5a5f	Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize (#323) ... Introducing a concept of NavLayer to filter navigable items	2016-07-24 14:56:14 +02:00
ocornut	175f42420c	Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag (#323)	2016-07-24 14:41:27 +02:00
ocornut	a424d6f805	Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) (#323)	2016-07-24 14:08:50 +02:00
ocornut	5cac4926c8	Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation (#323)	2016-07-24 13:56:31 +02:00
ocornut	ba43310df1	Navigation: Renaming, shortened some unnecessary long fields names (#323)	2016-07-24 12:46:25 +02:00
ocornut	4bbdaa4e3c	Navigation: Moving NavInitWindow() around and making it static (#323)	2016-07-24 11:56:36 +02:00
ocornut	c2cb2a6928	Gamepad/Keyboard navigation support, initial commit, WIP (#323)	2016-07-20 00:02:59 +02:00
ocornut	0300e73b3f	Comments	2016-07-18 15:26:07 +02:00
ocornut	2df229d002	Fixed incorrect comment for ParentWindow (#615, #604)	2016-07-18 15:26:06 +02:00
ocornut	91e1c56da6	Minor bits.	2016-07-18 15:25:59 +02:00
ocornut	d9e2e688e9	InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. (#725) ... Partial fix, won't stop ids from functioning because of a zombie id.	2016-07-13 01:18:59 +02:00
ocornut	de61fcc619	Minor bits	2016-06-25 17:03:49 +02:00
ocornut	1ef7980e17	Merge branch 'master' into 2016-02-colorpicker	2016-06-15 10:05:17 +02:00
ocornut	c4db79f34b	Member variable name renamed "ID" "Id" for casing consistency	2016-06-12 22:27:15 +02:00
ocornut	d1c073a199	Comments, tweaks	2016-05-31 00:00:44 +02:00
ocornut	5d4cf1c3f3	Version 1.50 WIP	2016-05-30 19:38:36 +02:00
ocornut	adb85d800d	Version 1.49	2016-05-29 19:16:44 +02:00
ocornut	9a751da136	Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files	2016-05-29 19:14:19 +02:00
ocornut	3ddb50a925	Merge branch 'master' into 2016-02-colorpicker	2016-05-29 19:07:23 +02:00
ocornut	45dacbf084	Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect. ... Relates to horizontal scrollbar, explicit contents size	2016-05-29 17:50:23 +02:00
ocornut	b7ebeb1610	Added SetNextWindowSizeConstraint() + demo code (#668)	2016-05-21 22:53:08 +02:00
ocornut	102d03a7eb	Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. (#668) ... Storing ActiveIdClickOffset to generalize pattern already used by columns.	2016-05-21 20:50:15 +02:00
ocornut	b630cb5b42	ImGuiWindow: Storing ParentWindow (#615, #646)	2016-05-10 17:00:42 +02:00
ocornut	7b9c0a5c3f	Renamed ImGuiState -> ImGuiContext (#586, #269)	2016-05-07 19:55:51 +02:00
ocornut	8b428e8c74	Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269)	2016-05-07 19:54:27 +02:00
ocornut	ce4d731486	Minor comments, tweaks	2016-05-07 18:10:32 +02:00
ocornut	313d388bba	Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows (#635)	2016-05-06 11:31:32 +02:00
ocornut	89d5026187	Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625, #579)	2016-05-02 12:32:16 +02:00
ocornut	9733f4fa24	Internal RenderBullet() helper.	2016-05-01 20:19:28 +02:00
ocornut	547f34cf22	Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516)	2016-05-01 17:43:51 +02:00
ocornut	df749e3f13	Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. (#600) ... New flag and declaration makes uses of SetNextTreeNode() functions on collapsing header more obvious as well (#579).	2016-05-01 14:34:55 +02:00
ocornut	7406d64c64	PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582)	2016-04-30 18:55:23 +02:00
ocornut	c5149cd53c	MenuItem(): checkmark render in disabled color when disabled	2016-04-27 23:34:24 +02:00
ocornut	6bcc31e575	Merge branch 'master' into 2016-02-colorpicker	2016-04-26 11:06:24 +02:00
ocornut	ea6b615179	Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610)	2016-04-26 11:03:51 +02:00
ocornut	41215534d5	Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),	2016-04-23 14:10:36 +02:00
ocornut	7ce6c18bbe	Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h (#600)	2016-04-21 09:55:02 +02:00
ocornut	ab4a69bcd4	Comments	2016-04-19 18:31:40 +02:00
ocornut	fc3b8d0a56	Relative order of Child windows creation is preserved during sort (#595)	2016-04-19 18:31:25 +02:00
ocornut	77177c18f0	Merge branch 'master' into 2016-02-colorpicker	2016-04-09 19:12:03 +02:00
ocornut	1588eda1ac	Version 1.49 WIP	2016-04-09 19:10:42 +02:00
ocornut	95cbcdca3f	Version 1.48	2016-04-09 17:46:48 +02:00
ocornut	4c1d4233b2	Merge branch 'master' into 2016-02-colorpicker	2016-04-03 01:10:26 +02:00
ocornut	d53c308852	Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394	2016-04-03 00:47:41 +02:00
ocornut	326c4e40f8	Merge branch 'master' into 2016-02-colorpicker	2016-03-28 23:17:13 +02:00
ocornut	cfbf06e394	Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)	2016-03-27 10:38:14 +02:00
ocornut	2b7eeba143	Trim trailing spaces	2016-03-26 15:38:52 +01:00
ocornut	baabe3b62c	Merge branch 'master' into 2016-02-colorpicker	2016-03-23 10:50:37 +01:00
ocornut	928832a5bc	Various tidying up / comments, moved columns functions declarations, no functional changes	2016-03-21 22:11:43 +01:00
Kyle Rocha	b8fcb4e7e4	Converted tabs to spaces	2016-03-21 12:40:02 -07:00
Kyle Rocha	3f46d9b933	Renamed FindTextDisplayEnd to FindRenderedTextEnd	2016-03-21 12:33:48 -07:00
Kyle Rocha	5bffc85ba6	Exposed FindTextDisplayEnd to imgui_internal.h	2016-03-21 12:07:13 -07:00
ocornut	459af7683c	Merge branch 'master' into 2016-02-colorpicker	2016-03-04 13:57:33 +01:00
ocornut	2065cbec4d	Removed extraneous comma for pedantic compilers (#516)	2016-03-03 00:34:06 +01:00
ocornut	b816d05e33	Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments	2016-03-03 00:30:08 +01:00
ocornut	6846873f23	Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master	2016-03-03 00:18:58 +01:00
ocornut	d45044fe54	CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy	2016-03-03 00:09:41 +01:00
ocornut	f8fede1d8b	Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346) ... Still pretty much experimenting so may break API	2016-02-21 23:23:30 +01:00
ocornut	339b67c01a	Exposed FindWindowByName() in imgui_internal.h	2016-02-20 17:37:36 +01:00
ocornut	b329a36d27	Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517)	2016-02-02 19:52:30 +01:00
Nikolay Zapolnov	a908c109c0	Added flag for selectables to handle double clicks.	2016-01-31 22:08:35 +01:00
ocornut	7afd62ec57	Tentative fix for GCC/Clang (#484, #504)	2016-01-25 21:45:45 +00:00
ocornut	595684e08c	Remove dependency on <new> header (#484, #504) ... (Now expecting something to fail somewhere..)	2016-01-25 21:26:53 +00:00
ocornut	005b897d7d	ProgressBar() handling of border size + storing border size in window structure (#503)	2016-01-24 11:00:37 +00:00
ocornut	3922988dea	TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label. ... Removed DisableHideTextAfterDoubleHash hack used by Metrics window.	2016-01-16 12:25:40 +00:00
ocornut	4e3c6f64c0	Various minor fixes following a pass of cppcheck static analyzer	2015-12-30 11:45:13 +01:00
ocornut	dc4a07c49a	Fixed various Clang -Weverything warnings	2015-12-26 14:59:07 +01:00
ocornut	e41568f87f	Version number 1.48 WIP + Update binaries	2015-12-26 10:02:57 +01:00
ocornut	24d186753e	Version number 1.47	2015-12-25 22:44:03 +01:00
ocornut	e4cf44e967	Minor rebranding "ImGui" -> "dear imgui" (#21)	2015-12-24 20:00:50 +01:00
ocornut	40ddf8e287	Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h (#448)	2015-12-24 14:47:11 +01:00
ocornut	6102aa1375	BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click (#439)	2015-12-20 23:39:47 +01:00
ocornut	66886405f6	Minor comment (#439)	2015-12-20 23:32:24 +01:00
ocornut	9b6b1bc0f3	Added GetColorU32 helpers (previously internal and misplaced as window->Color())	2015-12-13 19:32:37 +00:00
ocornut	ecc97bda7d	Added SetItemAllowOverlap() exposed in imgui_internal.h only	2015-12-03 21:30:17 +00:00
ocornut	9dca2ca960	Comments & spacing	2015-11-29 22:01:26 +00:00
ocornut	6269859315	Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.	2015-11-29 14:15:07 +00:00
ocornut	4ca34a879d	Columns: Fixed bug with indentation within columns, also making code shorter/faster (#414, #125)	2015-11-28 16:36:25 +00:00
ocornut	807d4ff92c	Columns: minor tidying up while investigating severe issues with indenting within columns (#414)	2015-11-28 12:14:50 +00:00
ocornut	1aac69c937	Columns: tidying up, moving OffsetT to a ImGuiColumnData structure	2015-11-26 23:01:15 +00:00
ocornut	3102c0c97e	Rename internal ColumnsStartX to IndentX, makes more sense	2015-11-26 22:43:21 +00:00
ocornut	92c518a420	InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374)	2015-11-19 23:09:59 +01:00
Jason Wilkins	4dee8473b5	Fixed a couple of problems found by CppCat code analyzer. ... * incorrect implementation of ImVec4 operator- which always gives a w value of 0 * boolean formula of ((A && B) || B) can be simplified to just (B)	2015-11-10 17:06:37 -06:00
ocornut	1a42a3f91b	Refactor internal SliderBehavior() to take flags instead of a bool. ... Sorry!	2015-10-30 11:43:23 +01:00
ocornut	3eabad0321	Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers. ... This is quite a risky change frankly but I'd rather refactor sooner than later. Hopefully few people are using the internal functions.	2015-10-30 11:36:51 +01:00
ocornut	5f0db60a57	Version number 1.47 WIP	2015-10-18 20:13:01 +01:00
ocornut	72dde4d323	Version 1.46	2015-10-18 17:36:27 +01:00
ocornut	7a61b7dd57	Renamed Window LastFrameDrawn to LastFrameActive, more correct	2015-10-18 16:57:10 +01:00
ocornut	43ff5a41be	InputText(): always use live input data for display in read-only mode (fix #360)	2015-10-18 15:50:46 +01:00
ocornut	d087671369	HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API.	2015-10-06 19:27:24 +02:00
ocornut	98465d401b	Silencing inadequate MSVC warnings when exporting as DLL (#345)	2015-09-22 00:53:51 +02:00
ocornut	3b01b0a2f2	Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts (#335)	2015-09-16 23:48:42 +01:00
ocornut	7b1168eb30	Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size	2015-09-11 16:01:54 +01:00
ocornut	07776595c2	Added missing IMGUI_API definitions in imgui_internal (fix #326)	2015-09-10 10:22:17 +01:00
ocornut	f5fb5f0c1e	Minor tidying, reordering functions/members/initialisation to follow same orders	2015-09-07 23:39:36 +01:00
ocornut	dafad3903e	Added GetDrawData() alternative to setting a Render function.	2015-09-07 14:56:39 +01:00
ocornut	965fa3cb16	Version number 1.46 WIP	2015-09-02 19:09:19 +01:00
ocornut	c9e19f8953	Version number 1.45	2015-09-01 20:34:10 +01:00
ocornut	71026d3655	Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246)	2015-08-30 18:33:38 +01:00
ocornut	a3cad2ff06	BeginChild() fixed missing rounding for child sizes which leaked into layout	2015-08-30 18:06:54 +01:00
ocornut	65a191c005	Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc (#246) ... GetCursorPos, SetCursorPos, GetContentRegionMax, GetWindowContentRegionMin, GetWindowContentRegionMax are now including the scrolling amount. It PROBABLY shouldn't break anything for you, but take note that SetCursorPosX(100.0f) puts you at +100 from the starting x position which may include scrolling, not at +100 from the window left side.	2015-08-30 16:37:56 +01:00
ocornut	fc13ae2aa5	Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit (#246)	2015-08-30 15:08:13 +01:00
ocornut	b326c8fd1f	Added GetCurrentWindowRead() for functions that don't write to the window	2015-08-30 11:56:04 +01:00
ocornut	2d565d4bfb	Style: rename ScrollbarWidth to ScrollbarSize (sorry!)	2015-08-29 23:47:47 +01:00
ocornut	65fe60f2b2	Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) (#282)	2015-08-29 18:13:30 +01:00
ocornut	ad3c9f620d	Tabs to spaces	2015-08-25 12:40:40 +01:00
ocornut	b1987d697f	Trim trailing whitespace (#305)	2015-08-24 13:50:18 +02:00