1699 Commits

Author	SHA1	Message	Date
omar	ab4ef822f0	Version 1.78 WIP	2020-06-30 16:56:09 +02:00
omar	90ea7e2f2f	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2020-06-30 16:43:16 +02:00
Rokas Kupstys	0738611559	Misc: Bunch of code formatting changes suggested by a pass running 'astyle'	2020-06-30 16:37:21 +02:00
omar	ddabfc3477	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2020-06-29 17:15:40 +02:00
omar	9418dcb693	Version 1.77 ... + fix minor clang-tidy warnings which seems reasonable	2020-06-29 15:54:28 +02:00
omar	7538bbabb6	Demo: Commented out ideas on another way to center a window.	2020-06-23 19:01:40 +02:00
omar	e1d7e14717	Viewports: used main viewport for centering (wip), clarified the meaning of how ImGuiPlatformMonitor WorkPos/WorkSize should be set if unknown, added asserts.	2020-06-23 18:42:01 +02:00
omar	a616ff5d4a	BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091) ... # Conflicts: # imgui.cpp	2020-06-23 17:54:55 +02:00
omar	b83a1f3b00	BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)	2020-06-23 17:52:13 +02:00
omar	20d61f5f62	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2020-06-20 22:06:01 +02:00
omar	8ead38c100	Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.	2020-06-18 17:02:24 +02:00
omar	704723744e	Disabled latest overzealous warnings from Clang	2020-06-18 16:19:51 +02:00
ocornut	37eb89371b	Popups: Internals: Added IsAnyPopupOpen().	2020-06-16 18:46:25 +02:00
ocornut	99ab521024	Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point	2020-06-15 22:12:38 +02:00
ocornut	2665288b30	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2020-06-11 11:36:38 +02:00
ocornut	40b799023b	Docs: Update fonts.md (#2861) + update all references to FONTS.txt	2020-06-09 16:56:48 +02:00
ocornut	8baa4ccff5	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2020-06-06 20:31:24 +02:00
ocornut	41e8837f59	Comments, adding some spacing in ImVec2() constructors.	2020-06-02 18:13:54 +02:00
omar	582f4db59b	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h	2020-05-07 22:13:47 +02:00
omar	673d6df85f	Demo: Clamping font scale. Added helpers in demo. Comments. Update sponsors. (#3206)	2020-05-07 11:45:41 +02:00
omar	f152fac4f1	Demo: Wrapped many (not all) code and comments lines to 120 characters to fit below GitHub viewer limit. (#3193)	2020-05-05 21:33:16 +02:00
omar	419f905f91	Demo: Extracted some code out of ShowStyleEditor() into NodeFont().	2020-05-05 19:53:54 +02:00
omar	5116eee108	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-05-04 15:05:07 +02:00
Ryan Pavlik	8cbff5ccb2	Fix various typos. (#3161) ... (found by Debian's lintian on a package that uses imgui.) (found by codespell.)	2020-04-28 16:10:15 +02:00
ocornut	266dff9bed	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui_internal.h	2020-04-20 11:33:56 +02:00
omar	54b38d88f7	TreeNode: Fixed bug where BeginDragDropSource() failed when the _OpenOnDoubleClick flag is set. Added basic demo code. (Amend 05420ea)	2020-04-15 12:31:51 +02:00
omar	e8c986b34e	Version 1.77 WIP	2020-04-14 14:55:50 +02:00
omar	b8e2b2bd6b	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-04-12 20:24:18 +02:00
omar	5503c0a12e	Version 1.76 ... + fixed PVS warning, update demo binaries, update readme image	2020-04-12 20:18:47 +02:00
omar	0e884304ee	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.h	2020-04-02 14:27:48 +02:00
omar	ec2a24a5f1	Selectable: Allow using ImGuiSelectableFlags_SpanAllColumns in other columns than first. Comments. (#125)	2020-03-26 20:33:39 +01:00
ocornut	a7ace918fe	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_win32.cpp # imgui.cpp	2020-03-05 11:48:57 +01:00
omar	0283a6e566	ImFont: Demo, Store Used4kPagesMap[] map in ImFont to facilitate iteration on all codepoints with a large value of IM_UNICODE_CODEPOINT_MAX. (#2815) ... Demo uses IsGlyphRangeUnused()	2020-03-03 18:53:29 +01:00
ocornut	05c3e0b898	Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2020-03-03 17:03:47 +01:00
omar	628614c6ea	Demo: Remove unnecessary code added by 24bd33ac.	2020-03-02 15:49:51 +01:00
ocornut	24bd33ace8	Menus: Some renaming, comments, add to demo. Amend 0342a3c. (#1207)	2020-02-28 16:42:24 +01:00
ocornut	75de34e281	Viewports, Docking: Added per-viewport work area system for e.g. menu-bars. Fixed DocksapceOverViewport() and demo code (overlay etc) (#3035, #2889, #2474, #1542, #2109) ... Clarified that BeginMenuMainBar() had an incorrect knowledge of its height (which was previously harmless). Designed to easily allow for status bars although we don't have/use them yet, but custom code could use them.	2020-02-26 23:58:45 +01:00
ocornut	e547f898a9	Demo: Added color gradient in demo to identify srgb/linear issues better. Tweaks.	2020-02-24 12:44:19 +01:00
Omar	bb1e6f8af6	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2020-02-17 18:33:59 +01:00
Omar	b62f1ea8e9	Fix zealous PVS studio warnings. Minor tweaks.	2020-02-17 16:17:46 +01:00
Omar	09329ea4e6	Fix Clang 9.0 zealous warnings	2020-02-17 15:29:59 +01:00
omar	b4ac420fc5	Demo: Amend d284a6c (#2149, #515)	2020-02-11 19:31:53 +01:00
omar	d284a6cffc	InputText: Fixed password fields displaying ASCII spaces as blanks. Fixed non-ASCII space occasionally creating unnecessary empty polygons. (#2149, #515)	2020-02-11 19:28:11 +01:00
omar	ccaec1a270	Version 1.76 WIP	2020-02-11 16:56:56 +01:00
omar	70975fe44d	Demo: Added a black and white gradient to Demo>Examples>Custom Rendering.	2020-02-10 22:08:52 +01:00
omar	d8948b5343	ColorButton: Added ImGuiColorEditFlags_NoBorder flag to remove the border normally enforced by default.	2020-02-10 21:24:03 +01:00
omar	8432d1bfc7	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2020-02-10 14:03:12 +01:00
omar	58b3e02b95	Version 1.75 ... Comments	2020-02-10 14:02:41 +01:00
omar	d37d25470a	Added IMGUI_DISABLE compile-time definition to make all headers and sources empty.	2020-02-09 17:08:33 +01:00
omar	5be649e082	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2020-02-02 21:21:54 +01:00
omar	47fab0e166	Misc renaming, comments. Docs: add missing spacing to Changelog.	2020-01-31 14:42:59 +01:00
omar	bbe946fb6c	Minor fixes/tweaks (some to reduce drift wiih master branch)	2020-01-28 20:08:04 +01:00
omar	5f4dfad5b7	Merge misc/shallow changes from Docking to reduce drift. ... Most are comments. Fix menu bar clipping: 07ff47bf1b	2020-01-28 20:06:34 +01:00
omar	f5528001f6	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # imgui.cpp # imgui_internal.h	2020-01-27 14:57:00 +01:00
omar	5363af7f47	AddCircle, AddCircleFilled: Add auto-calculation of circle segment counts (amends) ... Tweak default max error value, Changelog, comments, path-fast for 12 segments circles, made LUT store ImU8	2020-01-23 14:55:05 +01:00
Ben Carter	051ce0765e	AddCircle, AddCircleFilled: Add auto-calculation of circle segment counts	2020-01-23 14:52:48 +01:00
omar	e499497ec5	Backends: Win32: Added support for io.KeySuper (Windows key) for consistency with other backends. (#2976) ... Even if realistically it is difficult to make good use of under Windows. + Style editor: Use a more explicit form of RadioButton() to avoid being depending on underlying flags type. (#2983)	2020-01-17 15:06:22 +01:00
omar	9ad4c5da7e	Fix zealous warnings + Internals: Renamed members from XxxxID to XxxxxId to be more consistent with rest of the codebase (still some inconsistency left that are harder to fix)	2020-01-16 23:44:05 +01:00
omar	44174b1fa1	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp # imgui_internal.h	2020-01-14 20:01:27 +01:00
omar	ff5299e0e0	Docs: FAQ, Comments.	2020-01-12 22:09:18 +01:00
omar	4b3c5ff5f1	Comments + minor moving	2020-01-11 16:08:17 +01:00
omar	861f786d81	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp	2020-01-10 14:38:09 +01:00
omar	d581939387	Removed trailing spaces.	2020-01-06 15:24:16 +01:00
omar	dc66f83db8	Additional duplicated comments about usage of std::string and input text resize callback (#2006, #1443, #1008)	2019-12-25 17:46:35 +01:00
omar	992736dc5d	Merge branch 'refs/heads/master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2019-12-13 17:06:27 +01:00
omar	3a800f2dc9	DragFloat: Mention usage of FLT_MAX, INT_MAX etc. explicitly. (#2931)	2019-12-13 11:56:51 +01:00
Ben Carter	0e74103659	ImDrawList: Add AddNgon(), AddNgonFilled() API.	2019-12-09 11:23:06 +01:00
omar	f9c26d23de	Removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017). ... Comments	2019-12-08 16:38:27 +01:00
omar	e4a59d0025	TabItem: honor ImGuiTabItemFlags_NoCloseButton passed as parameter (although undocumented and part of private api) (#2923)	2019-12-07 16:22:07 +01:00
omar	b521cd357d	Removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions. ... (none of the other functions have it).	2019-12-05 18:33:36 +01:00
omar	8342e5b91a	Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4) ... Amend b5cad20d79, 945a509773 + unrelated minor typos	2019-12-05 15:45:30 +01:00
omar	abaf0256b8	Version 1.75 WIP ... Added message to font file loading assert.	2019-11-28 20:58:16 +01:00
omar	813e0c18e6	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx12.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h	2019-11-26 12:23:43 +01:00
omar	bdce833636	Version 1.74	2019-11-25 18:38:53 +01:00
omar	26d177bc03	Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks	2019-11-25 18:29:28 +01:00
omar	bbe0409942	Metrics: Show wire-frame mesh and approximate surface area when hovering ImDrawCmd. Amend aeb5795. ... Internals: Added ImTriangleArea()	2019-11-25 12:01:04 +01:00
omar	0cb1c633ff	Demo: tweaked demo help section, reference to "Examples" and "Tools". Reference to Keyboard navigation. Removed some of the more "obvious/standard" controls.	2019-11-24 23:11:53 +01:00
omar	51a02b319c	Added IM_UNICODE_CODEPOINT_MAX. Changed specs of ImFontAtlas::AddCustomRectRegular() (breaking change).	2019-11-21 14:13:17 +01:00
omar	ecbedc8c26	Tweaks, ammend 93efa54, rename to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS (#1038)	2019-11-19 21:29:12 +01:00
omar	4e90906b04	Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734) ... Using in Emscripten example.	2019-11-19 21:14:44 +01:00
omar	93efa5415f	Renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_STRING_FUNCTIONS. (#1038) ... Renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS.	2019-11-19 20:53:17 +01:00
omar	a1e43c682a	Merge branch 'master' into docking (with fixes) ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-11-15 15:32:36 +01:00
omar	c3fd4ae473	Docking: comments	2019-11-12 11:06:02 +01:00
omar	6e8e2c0fa9	Scrollbar: Fixed an issue where scrollbars wouldn't display on the frame following a frame where all child window contents would be culled. ... Demo: Fixed a small bug with scrolling demo. Metrics: Tweaks.	2019-11-08 19:01:54 +01:00
omar	69b5c2f541	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-11-08 15:45:12 +01:00
omar	57dc34f4e8	TreeNode: Added IsItemToggledOpen() to explicitly query if item was just open/closed, facilitating interactions with custom multi-selections patterns. (#1896, #1861)	2019-11-08 15:30:15 +01:00
omar	b3e94f5de8	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-10-29 17:21:19 +01:00
Sam Hocevar	0b2d35f63f	Fix snprintf and vsnprintf definition inconsistencies.	2019-10-28 13:58:32 +01:00
omar	0cbb96895a	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx12.cpp # imgui.cpp # imgui.h # imgui_widgets.cpp	2019-10-24 15:11:37 +02:00
omar	048b73dfaa	Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.	2019-10-21 20:57:07 +02:00
omar	7feccf9ab2	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # imgui.cpp	2019-10-18 16:50:30 +02:00
omar	53278be61f	FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey.	2019-10-18 16:18:05 +02:00
omar	bf4880f6a2	Merge branch 'master' into docking	2019-10-07 19:14:37 +02:00
omar	3b271b1847	Demo: Added simple item reordering demo in Widgets -> Drag and Drop section. (#2823, #143) [@rokups]	2019-10-07 17:52:31 +02:00
omar	e0c0e53edf	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-10-04 19:22:42 +02:00
omar	1425bec7a4	Demo: Text baseline demo tweaks.	2019-10-03 18:30:42 +02:00
omar	c262276988	Version 1.74 WIP	2019-09-30 14:27:56 +02:00
omar	6994bf10bc	Merge branch 'master' into docking + fix for RenderMouseCursor() ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h	2019-09-24 17:14:51 +02:00
omar	d5efe16157	Version 1.73	2019-09-24 17:02:26 +02:00
goran-w	e100523917	CollapsingHeader: Added support for ImGuiTreeNodeFlags_Bullet and ImGuiTreeNodeFlags_Leaf on framed nodes. (#2159, #2160) ... The Bullet and Leaf ImGuiTreeNodeFlags are now taken into account for Framed/CollapsingHeader tree nodes as well. TreeNodeEx() can be used to specify these flags. A choice was made to left-adjust the Framed text when no Bullet/Arrow is rendered, since this was deemed to look better in the Framed context (especially when considering that CollapsingHeader is drawn using NoTreePushOnOpen, so child/sibling Text items etc will often be non-indented).	2019-09-24 12:48:49 +02:00
omar	ca858c084b	Demo tweaks. Comments. Compacting the rarely used AutoFitXXX fields in ImGuiWindowTempData.	2019-09-23 20:15:25 +02:00
omar	af93c21cf9	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-09-18 17:27:14 +02:00
omar	656c515bad	Warning fix.	2019-09-18 17:21:04 +02:00
omar	9d02ed51e3	TreeNode: Added ImGuiTreeNodeFlags_SpanAvailWidth and ImGuiTreeNodeFlags_SpanFullWidth flags (#2451, #2438, #1897) ... Added demo bits.	2019-09-18 17:13:41 +02:00
omar	575df6f192	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h	2019-09-17 16:35:50 +02:00
omar	b48dc067ae	Style: Allow style.WindowMenuButtonPosition to be set to ImGuiDir_None to hide the collapse button. (#2634, #2639) ... + Fix #2775	2019-09-17 16:33:15 +02:00
omar	3b014d0c31	Merge branch 'features/ellipsis_rendering' ... # Conflicts: # imgui.cpp	2019-09-17 12:07:30 +02:00
omar	7d5a17e5e4	Remove trailing spaces (grep for ' \r?$' in visual studio)	2019-09-17 11:33:18 +02:00
omar	57623c15dd	Font: Narrow ellipsis: various minor stylistic tweaks (#2775)	2019-09-17 11:13:34 +02:00
omar	3dcf323c35	Columns: Separator: Fixed a bug where non-visible separators within columns would alter the next row position differently than visible ones. ... Fixed rounding issues also leading to change of ScrollMax depending on visible items (in particular negative coordinate would be rounded differently)	2019-09-16 19:15:43 +02:00
omar	0bdc145343	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-31 19:19:00 +02:00
omar	3f99890f40	TabBar: feed desired width (sum of unclipped tabs width) into layout system to allow for auto-resize. (#2768) ... Before 1.71 tab bars fed the sum of current width which created feedback loops in certain situations. Amend f95c77eeea.	2019-08-29 14:57:34 +02:00
omar	bfcdaeb610	Disable with ConfigWindowsMemoryCompactTimer < 0.0f (#2636)	2019-08-28 20:30:36 +02:00
omar	62f75c7fb1	Added a mechanism to compact/free the larger allocations of unused windows (buffers are compacted when a window is unused for 60 seconds, as per io.ConfigWindowsMemoryCompactTimer = 60.0f). Note that memory usage has never been reported as a problem, so this is merely a touch of overzealous luxury. (#2636)	2019-08-28 20:28:36 +02:00
Hanif Bin Ariffin	45a0db5979	Demo: PlotLine example displays the average value. (#2759) + extra comments	2019-08-28 19:23:43 +02:00
omar	e1fca8d982	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-08-23 12:21:49 +02:00
omar	cb538fadfe	Internals: Storing settings using ImVec2ih to match what we are doing with dock node. + removed ImMax from reading Size value (done in Begin) + removed seemingly unnecessary FLT_MAX compare in SettingsHandlerWindow_WriteAll. ... About: Added backquote to text copied into clipboard so it doesn't mess up with github formatting when pasted.	2019-08-23 12:02:52 +02:00
omar	c4ff1b3578	ImDrawList: clarified the name of many parameters so reading the code is a little easier. (#2740)	2019-08-22 17:43:57 +02:00
omar	c4b0bf718a	More typos in comments (#2738)	2019-08-22 11:40:37 +02:00
omar	aedcd2fb1a	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx11.cpp # imgui.cpp	2019-08-19 21:49:53 +02:00
omar	f624455d7b	Version 1.73 WIP	2019-08-01 10:57:13 -07:00
omar	b8d8355f10	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-31 14:34:58 -07:00
omar	6a0d0dab5a	Version 1.72b (patch for nav)	2019-07-31 14:31:06 -07:00
omar	4cfaf7d89c	Scrolling, Nav: Fixed programmatic scroll leading to a slightly incorrect scroll offset when the window has decorations or a menu-bar (broken in 1.71). This was mostly noticeable when a keyboard/gamepad movement led to scrolling the view, or using e.g. SetScrollHereY() function. Fix/amend a0994d74.	2019-07-31 14:31:06 -07:00
omar	1b1e539288	Internal: Moved NavScrollToBringItemIntoView() declaration to imgui_internal.h. Fixed spacing missing in 494d804. Fixed changelog wreck from 1.72.	2019-07-30 18:21:44 -07:00
omar	9183e7c426	Version 1.73 WIP	2019-07-29 15:54:32 -07:00
omar	a1164399b0	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-07-27 18:21:41 -07:00
omar	ecb9b1e2eb	Version 1.72	2019-07-27 18:15:07 -07:00
omar	7a26a49f08	Internal: Added IsMouseDragPastThreshold(). Tweaks. Todo. ... Demo: Showing how to use the format parameter of Slider/Drag functions to display the name of an enum value instead of the underlying integer value	2019-07-26 17:19:01 -07:00
omar	db2581bee9	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-07-23 13:35:01 -07:00
omar	51853292cc	ImDrawList: Using ImDrawCornerFlags instead of int in various apis. ... Demo: Using ImGuiColorEditrFlags instead of int.	2019-07-23 10:41:48 -07:00
omar	dcd03f62a7	Scrolling: Made it possible for mouse wheel and navigation-triggered scrolling to override a call to SetScrollX()/SetScrollY(), making it possible to use a simpler stateless pattern for auto-scrolling. ... Demo: Log, Console: Using a simpler stateless pattern for auto-scrolling.	2019-07-22 18:49:51 -07:00
omar	0e6a096afd	Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. (#2109) ... Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.	2019-07-22 11:29:22 -07:00
omar	9cda3035fd	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # imgui.cpp	2019-07-22 10:29:14 -07:00
omar	c37f21788f	Columns: Made GetColumnOffset() and GetColumnWidth() behave when there's no column set, consistently with other column functions + fixed Columns demo (#2683)	2019-07-21 11:23:15 -07:00
omar	9f35ba8546	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-07-19 15:19:10 -07:00
omar	493795cdd1	Columns: Fix support for BeginColumns() with a count of 1 (not that this isn't available via the old Columns() api). Tweaked Demo to facilitate testing for it.	2019-07-19 12:11:00 -07:00
omar	7fd34d4f30	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-07-17 18:48:16 -07:00
omar	61c7f0194e	Misc: Made Button(), ColorButton() not trigger an "edited" event leading to IsItemDeactivatedAfterEdit() returning true. This also effectively make ColorEdit4() not incorrect trigger IsItemDeactivatedAfterEdit() when clicking the color button to open the picker popup. (#1875) ... Demo: Added Button with repeater and InputFloat with +/- button to the status query test demo.	2019-07-17 17:10:28 -07:00
omar	ea79992d9a	Fixed old SetWindowFontScale() api value from not being inherited by child window. Added comments about the right way to scale your UI (load a font at the right side, rebuild atlas, scale style). ... + Added missing IMGUI_API marker to the EmptyString storage used by ImGuiTextBuffer. (#2672)	2019-07-17 10:01:49 -07:00
omar	56e10f1c35	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h	2019-07-16 18:29:31 -07:00
omar	e6a286b3a5	Style: Added style.ColorButtonButton (left/right, defaults to ImGuiDir_Right) to move the color button of ColorEdit3/ColorEdit4 functions to either side of the inputs.	2019-07-16 16:43:21 -07:00
omar	a35f42f123	Removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). (#581, #324)	2019-07-15 18:30:20 -07:00
omar	e461e7bc7a	Moved ImGuiColumnsFlags erroneously forward declared in imgui.h + demo bit.	2019-07-14 12:29:23 -07:00
omar	1f54c16f52	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-07-02 18:47:10 +02:00
omar	e16564e67a	Scrollbar: Avoid overlapping the opposite side when window (often a child window) is forcibly too small.	2019-07-01 20:59:00 +02:00
omar	da29d77253	Added SetScrollXHere, SetScrollFromPosX: Changelog, demo, comments (#1580).	2019-07-01 12:15:53 +02:00
omar	82711251b6	Internals: ImGuiListClipper using absolute coordinate (instead of relative one). Minor no-op tweaks + ImDrawListSplitter assert	2019-06-29 20:10:55 +02:00
omar	eb3e271c24	Demo: Using ImVec2(-FLT_MIN,0.0f) instead of ImVec2(-1.0f,0.0f) where it makes sense. (#2449)	2019-06-23 18:20:25 +02:00
omar	e2c1f0a7cd	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-06-18 23:12:50 +02:00
omar	e9b92d1cef	Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. (#2618) ... + Fix version number in imgui.h	2019-06-17 11:32:00 +02:00
omar	b27fd87177	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h	2019-06-17 11:10:14 +02:00
omar	5286ecb8a7	Version 1.72 WIP	2019-06-14 11:58:58 +02:00
omar	d3d998a885	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/README.txt # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp	2019-06-12 18:40:50 +02:00
omar	2da1c66d15	Version 1.71 + comments	2019-06-12 18:30:06 +02:00
omar	4597632662	Readme, comments, dear imgui prefixes	2019-06-11 16:11:36 +02:00
omar	e6850891cc	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-06-05 16:09:06 +02:00
omar	c1a61d25a7	Scrollbar overlap an extra WindowBorderSize amount on the left to make all distances consistent. Reverted to BorderSize not affecting work/contents rectangles. Scrollbar, Style: Changed default style.ScrollbarSize from 16 to 14.	2019-06-05 15:59:14 +02:00
omar	15282261dd	Internals: Minor no-op tidying up toward solving the WindowPadding / WindowBorderSize / ScrollbarSize overlapping mess. ... + Demo: Use SetScrollY().	2019-06-05 15:59:14 +02:00
omar	d6df777ff2	TextWrapped, PushTextWrapPos(0.0f) within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size).	2019-06-05 15:59:13 +02:00
omar	f95c77eeea	Window rectangles: Changed WorkRect to cover the whole region including scrolling (toward obsolete ContentsRegionRect) + using full WindowPadding*1 padding. ... Tweaked InnerClipRect. TreeNode, CollapsingHeader: Fixed highlight frame not covering horizontal area fully when using horizontal scrolling. (#2211, #2579) TabBar: Fixed BeginTabBar() within a window with horizontal scrolling from creating a feedback loop with the horizontal contents size. Columns: Fixed Columns() within a window with horizontal scrolling from not covering the full horizontal area (previously only worked with an explicit contents size). (#125) Demo: Added demo code to test contentsrect/workrect	2019-06-05 15:59:13 +02:00
omar	5cdd788f30	Comments (#2599). Moved branch Changelog above 1.71 wip one. Added some missing changelog bits.	2019-06-05 00:37:14 +02:00
omar	8dc04a4c9f	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp # imgui.h # imgui_demo.cpp	2019-05-29 16:32:27 +02:00
omar	7755cbbef2	Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. (#2591) + Fix OpenGL3 code missing flag.	2019-05-29 16:29:17 +02:00
omar	c72040a715	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_osx.h # examples/imgui_impl_osx.mm # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2019-05-29 16:20:26 +02:00
omar	d1e8b698d0	ImDrawList: Added ImDrawCmd::VtxOffset value to support large meshes (64k+ vertices) using 16-bits indices. To enable the feature, the renderer back-end needs to set 'io.BackendFlags |= ImGuiBackendFlags_HasVtxOffset' and honor the ImDrawCmd::VtxOffset field. Otherwise the value will always be zero. This has the advantage of preserving smaller index buffers and allowing to execute on hardware that do not support 32-bits indices. ... ImDrawList: Added ImDrawCmd::IdxOffset value, equivalent to summing element count for each draw command. This is provided for convenience and consistency with VtxOffset. (#2591)	2019-05-29 16:13:38 +02:00
omar	2d68e892a8	Added full "Dear ImGui" prefix to the title of "Dear ImGui Demo" and "Dear ImGui Metrics" windows. Shortened amount of nodes in columns>tree demo.	2019-05-27 18:38:28 +02:00
omar	70a4be07df	ColorEdit: Fixed the color picker popup only displaying inputs as HSV instead of showing multiple options. (#2587, broken in 1.69 by #2384).	2019-05-27 14:57:39 +02:00
omar	afad952450	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h # imgui_widgets.cpp	2019-05-24 21:58:17 +02:00
omar	958d75c00a	Style: Added style.WindowMenuButtonPosition (left/right, defaults to ImGuiDir_Left) to move the collapsing/docking button to the other side of the title bar.	2019-05-24 21:54:52 +02:00
omar	fda1365c15	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-05-23 00:04:25 +02:00
omar	a2eec8f5b5	Fix OuterRectClipped not being clipped correctly, which resulted in child window outside visible bound to not be marked with SkipItems. Broken in b50c61c961. ... + Comments on InnerClipRect being misleading. Demo: Tweak to sizing of child window in the Layout->Scrolling section.	2019-05-22 22:14:31 +02:00
omar	04022114d9	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-05-21 14:47:29 +02:00
omar	f242cd4d8a	Fixed GCC mem-access warnings (#2565) ... + using "if defined" more consistently for Clang.	2019-05-19 17:15:14 +02:00
omar	4158cba1ff	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h	2019-05-13 19:23:18 +02:00
omar	632469d2e5	Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.	2019-05-13 15:11:25 +02:00
omar	7355c84701	Tweak EndGroup() to facilitate fixing #2550 later (currently should have no side-effect0. Demo: Add extra widget to status query test.	2019-05-12 21:42:36 +02:00
omar	835a8b2c9b	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2019-05-10 22:56:43 +02:00
omar	e29176df53	Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.	2019-05-09 13:12:09 +02:00
omar	42fc563fed	Version 1.71 WIP + fixed minor typo	2019-05-07 16:36:08 +02:00
omar	d1d5075b66	Version 1.70	2019-05-06 14:17:39 +02:00
omar	76e61958fd	Merge branch 'master' into docking ... # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	2019-05-06 10:16:43 +02:00
omar	86f92fe756	Demo: Improved trees in columns demo. (#2136)	2019-05-02 21:32:36 +02:00
omar	825b61e4ba	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp # imgui.cpp	2019-05-02 14:56:47 +02:00
omar	3fbc0b7a9e	Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.	2019-04-29 18:33:08 +02:00
omar	7e67aba286	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-04-29 13:06:55 +02:00
omar	0f2852806c	Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)	2019-04-29 12:44:17 +02:00
Richard Mitton	4c0f34fd5d	Improved algorithm for mitre joints on thick lines	2019-04-29 12:07:03 +02:00
omar	842a720e72	Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).	2019-04-28 22:33:58 +02:00
omar	dfb82d5c22	Merge branch 'master' into docking ... # Conflicts: # examples/example_sdl_opengl2/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_sdl.h # imgui.cpp	2019-04-25 17:53:11 +02:00
omar	6db0766564	Misc comments, internal renaming, added disable indentation option to Columns demo section.	2019-04-24 17:40:07 +02:00
omar	03b64defa5	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h	2019-04-19 19:52:45 +02:00
omar	5078fa208b	Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.	2019-04-18 18:29:28 +02:00
omar	8d53f834ee	Demo: Documents: Fix misusage of ListBoxHeader().	2019-04-18 18:24:51 +02:00
omar	1aeee9d40f	Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows. ... Renamed SameLine() first parameter.	2019-04-17 22:12:17 +02:00
omar	655ebe4eaf	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-04-16 13:14:10 +02:00
omar	742b5f4c68	Merged a bunch of small changes from Docking branch to reduce the difference between branches. ... Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.	2019-04-16 13:07:43 +02:00
omar	712203dbcb	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-04-13 18:53:00 +02:00
omar	ee02cdbf03	Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)	2019-04-12 17:49:40 +02:00
omar	328e4fa7e7	Merge branch 'master' into docking ... # Conflicts: # imgui_demo.cpp	2019-04-11 15:53:38 +02:00
omar	570d0bbbda	Demo: Comments, tweaks, removed some uses of ImColor helpers.	2019-04-11 15:23:54 +02:00
omar	49fb8e6c45	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp	2019-04-03 11:17:26 +02:00
omar	4a57507f75	InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336) ... Not using isprint. + todo items.	2019-04-03 10:40:14 +02:00
omar	3a737e665a	Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo	2019-04-02 10:36:35 +02:00
omar	8d4b5fef1d	Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. (#2109)	2019-03-27 17:36:52 +01:00
omar	04a9ce3a18	Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109)	2019-03-27 16:16:31 +01:00
omar	f208fd7ebb	Docking: Fixed crash with ImGuiDockNodeFlags_AutoHideTabBar flag. (#2423, #2109)	2019-03-26 12:33:58 +01:00
omar	9350158d61	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h	2019-03-25 16:08:09 +01:00
omar	d9f6ba3035	IsWindowHovered() made change which should have no effect in master but fix result of IsWindowHovered(ImGuiHoveredFlags_ChildWindows) over multiple viewport in docking branch. (#2432)	2019-03-25 15:39:11 +01:00
omar	221bf93a55	Comments, todo list, remove trailing spaces.	2019-03-17 00:56:21 +01:00
omar	857381b9ca	GetMouseDragDelta(): also returns the delta on the mouse button released frame. Verify that mouse positions are valid otherwise returns zero. Removed obsolete comment. Tweaked demo. (#2419)	2019-03-15 15:03:37 +01:00
omar	ff03ae503b	Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421)	2019-03-15 13:09:07 +01:00
omar	cf2c52282d	Version 1.70 WIP	2019-03-15 13:07:30 +01:00
omar	ebe79bbed0	Demo: Custom rendering: Minor sizing issue fix.	2019-03-13 15:44:23 +01:00
omar	b1af4d36ce	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp	2019-03-13 15:30:35 +01:00
omar	55c02099c5	Version 1.69, comments, typos	2019-03-13 15:29:43 +01:00
omar	9afb849e16	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp	2019-03-12 18:28:47 +01:00
omar	495065f790	Fixed Clang and PVS warnings.	2019-03-12 12:08:51 +01:00
omar	897badec7a	Demo: InputText: Demonstrating use of ImGuiInputTextFlags_CallbackResize. (#2006, #1443, #1008).	2019-03-12 11:24:49 +01:00
omar	f7db4fad31	Merge branch 'master' into docking ... # Conflicts: # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui.cpp	2019-03-11 16:08:16 +01:00
omar	3eedb542a6	Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.	2019-03-11 11:07:23 +01:00
Haldean Brown	79bb4ce128	Added ImGuiColorEditFlagsFlags_InputHSV. (#2383, #2384)	2019-03-08 18:16:41 +01:00
omar	e91d275b10	Merge branch 'master' into docking ... # Conflicts: # imgui_demo.cpp	2019-03-06 21:18:46 +01:00
omar	ea8158acdf	Demo: Renamed ShowHelpMarker() -> HelpMarker(). Fixed minor PVS warning. Removed unnecessary casts.	2019-03-06 18:24:07 +01:00
omar	c779fbb651	InputTextWithHint: Fix for Password fields. Update changelog, demo. (#2400)	2019-03-06 17:33:24 +01:00
Lucas Lazare	ab80ee6453	Added InputTextWithHint() (#2400) ... Squashed commit of the following: commit 1970d84051 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 12:20:39 2019 -0500 Removing sneaky tabulations #2 (why, editor T-T) I should update my settings, I guess commit 219bdfcb7f Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 12:17:27 2019 -0500 Removing useless check introduced in b0d172 commit 8afd7a2b45 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:49:24 2019 -0500 Removing sneaky tabulations commit 8e04908631 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 11:45:13 2019 -0500 Moving InputTextHinted code to InputTextEx commit b0d1723a2f Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Tue Mar 5 00:23:02 2019 -0500 C++11 to C++98 commit 9afeae3998 Author: Lucas Lazare <lazarelucas@yahoo.fr> Date: Mon Mar 4 23:43:28 2019 -0500 Added InputTextHinted	2019-03-06 17:33:05 +01:00
omar	e02d6014bf	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-03-05 22:13:38 +01:00
omar	9c45072cb0	Demo: Added flags to InputTextMulttiline() demo.	2019-03-05 19:25:07 +01:00
omar	8414c0bb09	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-03-04 18:08:19 +01:00
omar	94e794f81b	Renamed GetOverlayDrawList() to GetForegroundDrawList() for consistency. Kept redirection function (will obsolete). (#2391) ... Demo: Using GetBackgroundDrawList() and GetForegroundDrawList() in "Custom Rendering" demo.	2019-03-04 16:35:50 +01:00
omar	49eb5f0280	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp	2019-03-03 23:34:56 +01:00
omar	1d0b4df3d9	Misc: Asserting in NewFrame() if style.WindowMinSize is zero or smaller than (1.0f,1.0f). Internal: ImHash functions tweaks. Added InputText() to query status section.	2019-02-28 22:57:22 +01:00
omar	ff0c6c2bde	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h	2019-02-27 19:00:09 +01:00
omar	736d3e2654	DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. (#643, #320, #708, #1011)	2019-02-27 18:16:03 +01:00
omar	6de09a5e48	Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. (#2384) [@haldean]	2019-02-27 16:45:58 +01:00
haldean	8a2f6866a6	add _Show prefix to color flags that control inputs, rename __InputsMask to __ShowMask ... This is anticipation of changing __InputsMask to control the format of input colors, and adding _InputRGB and _InputHSV to change how input colors are interpreted.	2019-02-27 16:24:15 +01:00
omar	87ded34f9f	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-02-22 12:29:18 +01:00
omar	257f5d204e	Version 1.69 WIP	2019-02-20 00:11:36 +01:00
omar	9dc02464a4	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-02-19 13:04:35 +01:00
omar	3c15dffc94	Version 1.68	2019-02-19 12:50:46 +01:00
omar	09c9bf2edb	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +01:00
omar	76dbff37cd	Selectable: Tweaks for #2347 (demo, changelog, member position)	2019-02-14 20:29:50 +01:00
haldean	b277cfffc8	Selectable: add support for specifying text alignment on selectables (#2347) ... Adds a style variable to Selectable that allows clients to specify the text alignment within Selectables, adds a section in the demo to demonstrate selectable text alignment, and a pair of sliders in the style editor to change selectable alignment on the fly. In terms of implementation, this one is extremely simple: Selectable was already calling an API that supports text alignment, but had hard-coded it to top-left. This changes that to just pass the style variable straight through to RenderTextClipped. Backwards-compatibility is preserved by defaulting the text_align parameter to (0, 0), i.e., top-left. This also fixes a bug with selectable text rendering that caused right-aligned text in a selectable to be clipped incorrectly, because the wrong clipping rectangle was being used.	2019-02-14 19:38:57 +01:00
omar	2206df9e7a	Demo: Added Auto-Scroll option in Log/Console. Comments. Removed some ImColor() uses.	2019-02-14 14:08:36 +01:00
omar	57a586b4f1	Font: Moved functions to internal block (not enforced). Made ConfigData pointer const. Added link to stb's notes.	2019-02-13 18:21:21 +01:00
omar	2cada3c143	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_widgets.cpp	2019-02-11 18:59:49 +01:00
omar	00c637961b	Demo: Font selector allow selecting fonts with same debug name. (#2332)	2019-02-08 14:59:09 +01:00
omar	4a3a895be9	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	f366828dd2	Minor tweaks to reduce false positive of PVS Studio static analyzer.	2019-02-06 13:16:52 +01:00
omar	e3dd95d335	Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. (#820, #956, #1875)	2019-02-06 11:52:42 +01:00
omar	be107ba8f8	Merge branch 'master' into docking ... # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-02-05 13:52:32 +01:00
omar	d38f4dc143	Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. (#261, #351)	2019-02-05 13:23:44 +01:00
omar	8e44aacc8e	Fonts: Fixed crash if FontGlobalScale is zero. Correctly debug naming default font if not 13 px. Demo: Moved PopupRounding along with other rounding values. Metrics: Displaying indexes with idx to be correct / less misleading.	2019-02-04 23:34:20 +01:00
omar	e215809c4d	Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).	2019-02-01 17:06:40 +01:00
omar	ac6d474103	Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).	2019-02-01 16:37:07 +01:00
omar	cbf24a9151	Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.	2019-02-01 11:04:04 +01:00
omar	52a9f8bd3e	Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.	2019-02-01 10:26:08 +01:00
omar	f906d53f7d	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-01-31 19:19:35 +01:00
omar	0a233a505d	imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.	2019-01-30 12:53:01 +01:00
omar	86d3bba157	Added ImGuiDockNodeFlags_AutoHideTabBar. (#2109)	2019-01-29 18:28:31 +01:00
omar	2ccc6d2ed1	Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.	2019-01-29 18:28:31 +01:00
omar	ed240c910b	Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. (#2318) [@bluescan]	2019-01-29 14:36:55 +01:00
omar	8a4422b2fa	Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. (#2308)	2019-01-27 23:54:17 +01:00
omar	13a5f5ba8b	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	4e8e177cac	Persistently fixing some PVS-Studio static analyzer false positive warnings.	2019-01-27 16:35:48 +01:00
omar	c3c2cd1e82	Fix various XCode and PVS-Studio static analyzer warnings (#2309)	2019-01-27 16:18:23 +01:00
omar	f94af2f5c5	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp	2019-01-20 22:13:35 +01:00
omar	8079344cee	Merge branch 'master' into viewport ... # Conflicts: # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.h # imgui.cpp	2019-01-20 22:12:06 +01:00
omar	2c38b32db1	Removed trailing spaces (#2038, #2299)	2019-01-20 17:56:17 +01:00
omar	f94ba546ba	Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)	2019-01-20 17:46:00 +01:00
omar	b5144e477f	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-01-17 14:06:42 +01:00
omar	e9c625a1dc	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp	2019-01-17 14:05:40 +01:00
omar	8cbb91261e	ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery] ... + Demo tweaks	2019-01-16 17:47:49 +01:00
omar	32c4e01267	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:13:23 +01:00
omar	06aaf23877	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:10:51 +01:00
omar	2f9bae140b	Docking: Demo: Fixed docking document window into parent window. (#2286)	2019-01-16 14:43:27 +01:00
omar	8a45c56c2c	Merge branch 'viewport' into docking	2019-01-15 21:22:29 +01:00
omar	9391a97fbf	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h	2019-01-15 21:22:21 +01:00
omar	95ee99e6aa	Version 1.68 WIP	2019-01-15 20:19:05 +01:00
omar	515ad62335	Merge branch 'viewport' into docking ... # Conflicts: # docs/TODO.txt	2019-01-15 15:14:16 +01:00
omar	73353fad64	Merge branch 'master' into viewport	2019-01-15 15:13:29 +01:00
omar	b8c6e31c2d	Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)	2019-01-15 15:05:56 +01:00
omar	ff4bd758ca	Merge branch 'viewport' into docking	2019-01-14 21:30:07 +01:00
omar	e24674fc0e	Merge branch 'master' into viewport	2019-01-14 21:30:01 +01:00
omar	7a5058e3bf	Version 1.67	2019-01-14 17:41:44 +01:00
omar	6e41745f31	Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)	2019-01-13 18:57:46 +01:00
omar	529fccd9c2	Merge branch 'viewport' into docking	2019-01-13 14:19:40 +01:00
omar	4ee4f65c70	Merge branch 'master' into viewport	2019-01-13 14:19:31 +01:00
omar	7e78865613	Demo: Fixed bounds of DragFloat in Clipping section to avoid passing zero-sized to InvisibleButton().	2019-01-12 19:48:07 +01:00
omar	8011197c50	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp	2019-01-10 16:02:32 +01:00
omar	c96aaef132	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2019-01-10 16:01:36 +01:00
omar	f53cd3ee0f	Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase. ... Demo: Typo. C98 fix.	2019-01-08 17:37:07 +01:00
omar	6b32570644	Merge branch 'viewport' into docking ... # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-01-07 21:29:15 +01:00
omar	5af930f97a	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-07 21:28:29 +01:00
omar	50faccf764	Demo: Log: Comments. Using clipper. Not linking with rand() anymore.	2019-01-07 17:33:02 +01:00
omar	5278da98d2	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_demo.cpp	2019-01-03 21:40:08 +01:00
omar	e1ed27aeaa	(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! (#1542)	2019-01-03 21:33:33 +01:00
omar	c8349d3305	Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.	2019-01-03 21:28:54 +01:00
omar	ce1626a51e	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-02 21:36:21 +01:00
omar	0d6e3ab2b0	Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)	2019-01-02 21:28:16 +01:00
omar	951c9dd68b	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2019-01-02 19:00:31 +01:00
omar	e194219f2e	Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)	2019-01-02 16:22:44 +01:00
omar	c738f9ef92	InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)	2019-01-02 11:03:56 +01:00
omar	e043b89814	Merge branch 'viewport' into docking ... # Conflicts: # imgui.h	2018-12-20 17:03:21 +01:00
omar	02501f07c3	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-12-20 16:54:32 +01:00
omar	6890e08bc5	Fixed using SetNextWindowPos() on a child window (which wasn't really documented) position the cursor as expected in the parent window, so there is no mismatch between the layout in parent and the position of the child window. Demo tweak and adding some child window stuff	2018-12-19 15:19:31 +01:00
omar	84d1ce3958	Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.	2018-12-18 16:17:27 +01:00
omar	9c916cdaf9	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-12-18 15:02:35 +01:00
omar	ac9512e095	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2018-12-14 18:46:24 +01:00
omar	f1c7596409	Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.	2018-12-14 18:42:22 +01:00
omar	9b09c7597f	Merge branch 'viewport' into docking ... # Conflicts: # imgui_demo.cpp	2018-12-13 19:21:51 +01:00
omar	2a1e903f43	Merge branch 'master' into viewport ... # Conflicts: # imgui.h	2018-12-13 19:20:34 +01:00
omar	8497948ba0	Comments, minor tweaks.	2018-12-13 19:17:36 +01:00
omar	991b16cc6a	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_widgets.cpp	2018-12-11 19:46:46 +01:00
omar	ccce47c6a2	Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.	2018-12-11 18:10:43 +01:00
omar	2886e0b6f5	Demo: Fix collateral damage of 54a60aa	2018-12-11 13:25:29 +01:00
omar	95dcc534ed	Demo: Fix collateral damage of 54a60aa	2018-12-11 13:25:16 +01:00
omar	067b691fd8	Merge branch 'viewport' into docking ... # Conflicts: # docs/TODO.txt # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_draw.cpp # imgui_internal.h # imgui_widgets.cpp	2018-12-11 13:23:00 +01:00
omar	c40feabe4d	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-11 12:41:40 +01:00
omar	54a60aaa40	Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature) ... - Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API. - Added ImGuiTabBarFlags flags for BeginTabBar(). - Added ImGuiTabItemFlags flags for BeginTabItem(). - Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors. - Demo: Added Layout->Tabs demo code. - Demo: Added "Documents" example app showcasing possible use for tabs.	2018-12-11 12:36:47 +01:00
omar	e6439e1a16	Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit ... # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp	2018-12-10 16:21:49 +01:00
omar	26b9e2d0a5	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2018-12-10 16:14:31 +01:00
omar	9476e07d5a	Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. (#899) ... Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height.	2018-12-10 16:05:30 +01:00
omar	59f3c4fc20	Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do.	2018-12-10 15:41:01 +01:00
omar	b96b1f2412	Docking: Documenting an issue. Renamed member of ImGuiDockFamily.	2018-12-04 16:38:27 +01:00
omar	6644f1ff64	Docking: Added io.ConfigDockingTabBarOnSingleWindows option (mostly made possible by the previous fixes). ... Note that dock node have regressions compared to current floating window: no collapse, no auto-resize, resize grip under the scrollbar, border issues, general overhead. Will tackle those.	2018-12-04 13:37:46 +01:00
omar	5105c6c0d0	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp	2018-12-04 00:06:26 +01:00
omar	3a678d48b1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp	2018-12-04 00:05:45 +01:00
omar	fb6ef8b1db	Comments, tweak	2018-12-03 23:50:59 +01:00
omar	10e13dd6bb	Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).	2018-12-03 12:19:23 +01:00
omar	ac10889bde	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt	2018-12-03 11:44:51 +01:00
omar	65e579e558	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp	2018-12-03 11:41:53 +01:00
omar	801645d350	Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).	2018-12-03 10:17:17 +01:00
omar	34e18ef771	Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.	2018-11-30 23:48:39 +01:00
omar	8289e5f6b4	Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.	2018-11-30 23:48:25 +01:00
omar	84238240d6	Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.	2018-11-30 23:47:23 +01:00
omar	7658035e5a	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:30:21 +01:00
omar	3849def253	Added ShowAboutWindow(), About Window now showing various config/build information.	2018-11-30 18:30:21 +01:00
omar	025e00cccc	About: Added build/system info relating to Docking branch.	2018-11-30 18:29:35 +01:00
omar	f78b5a0cdb	Merge branch 'viewport' into docking	2018-11-30 18:27:14 +01:00
omar	ec49a486c7	About: Added build/system info relating to Viewport branch.	2018-11-30 18:27:04 +01:00
omar	afeefadb4e	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.h	2018-11-30 18:24:43 +01:00
omar	a423f032ee	About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.	2018-11-30 18:18:15 +01:00
omar	4ef06f5aa2	Added ShowAboutWindow(), About Window now showing various config/build information.	2018-11-30 18:02:01 +01:00
omar	3bcc25f588	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp # imgui.h	2018-11-27 19:56:23 +01:00
omar	c08b4b46f4	Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196)	2018-11-27 19:46:36 +01:00
omar	962dcb466d	Docking: Added ImGuiDockNodeFlags_NoResize. (#2109)	2018-11-26 21:52:40 +01:00
omar	ddc3f8f069	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h	2018-11-26 15:32:04 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	131de7ab62	Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109)	2018-11-23 18:42:16 +01:00
omar	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	2515413080	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui_widgets.cpp	2018-11-22 15:29:18 +01:00
omar	d87b80c6c1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-11-22 15:28:27 +01:00
omar	da3c4330c1	Version 1.66	2018-11-22 15:11:52 +01:00
omar	565af90958	Merge branch 'viewport' into docking	2018-11-06 09:52:38 +01:00
omar	52ca91ca57	Merge branch 'master' into viewport	2018-11-05 17:29:31 +01:00
Torkel Bjørnson-Langen	1441756a0f	Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() (#2153)	2018-11-05 14:17:51 +01:00
omar	168af9b377	Merge branch 'viewport' into docking ... # Conflicts: # imgui_demo.cpp	2018-10-25 23:45:19 +02:00
omar	50f6e12d31	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-10-25 23:41:13 +02:00
omar	f3e642322f	Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.	2018-10-25 23:40:33 +02:00
omar	eed1fba157	Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. (#2152)	2018-10-25 23:34:05 +02:00
omar	ac9aaf4b6e	Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.	2018-10-25 17:45:48 +02:00
omar	c547b2e8ee	Added DockSpaceOverViewport() call, not sure about this because of the menu bar limitation. (#2109)	2018-10-25 15:34:53 +02:00
omar	5f8c9ae0ef	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:57:54 +02:00
omar	056af2b1af	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:56:26 +02:00
omar	000c1fc221	Demo: Added comments / tweaks related to the popups.	2018-10-16 10:25:32 +02:00
omar	90b50bd4c3	Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660)	2018-10-15 18:16:49 +02:00
omar	8b956216b7	Demo: Testing return value of BeginTabBar() for consistency.	2018-10-15 17:19:52 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	c398153b40	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h	2018-10-12 13:01:20 +02:00
omar	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	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	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	2cff3f6a65	Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.	2018-10-01 18:35:21 +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	35d1fb7b34	Style: Added style.TabRounding setting.	2018-09-30 18:41:07 +02:00
omar	c6193d0605	Merge branch 'viewport' into docking	2018-09-26 21:35:09 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	61d94ff88e	Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).	2018-09-26 21:30:37 +02:00
omar	d3e8e5731a	Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().	2018-09-25 17:45:06 +02:00
omar	3d318a6577	ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different. ... Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.	2018-09-20 10:24:29 +02:00
omar	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	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	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	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	df65d4a14f	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	d014d0285a	DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. (#2024)	2018-09-11 11:15:06 +02:00
omar	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	d5692bff00	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:30:14 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
omar	a82be53407	Merge branch 'docking2' into viewport_docking ... # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2018-09-06 22:28:21 +02:00
omar	bd5b38e232	Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) (#351)	2018-09-06 21:45:46 +02:00
omar	58d46e1fe6	Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261, #351)	2018-09-06 21:45:44 +02:00
omar	eb7033e75b	Version 1.66 WIP	2018-09-06 21:44:59 +02:00
omar	b974fffea0	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-09-06 15:59:35 +02:00
omar	e0cab5664a	Version 1.65	2018-09-06 15:58:58 +02:00
omar	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	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	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	bcb1441ce7	Version 1.65 WIP	2018-09-03 14:38:04 +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	6c34bffbb5	Version 1.64 WIP	2018-08-30 19:00:22 +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	f81caac459	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-08-25 21:19:42 +02:00
omar	3612885dea	Comments, demo	2018-08-23 13:37:06 +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	a4191857c1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_vulkan.h # imgui.cpp	2018-08-22 21:35:44 +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	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	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	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	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	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	671e516377	Demo: Fix using ambiguous InputFloat() call which redirect to obsolete version. (#1990)	2018-07-31 18:38:15 +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	d5400d9517	Fixes for pre-C++11 compilers. ... That said, I think we can consider upgrading requirement to an early VS-friendly subset of C++11. The thing I would like the most from C++11 are forward-declared enum (from VS 2012 onward).	2018-07-30 17:42:27 +02:00
omar	2a67aeaa3d	Visual Studio: calling into _vsnprintf. (#1085)	2018-07-30 16:01:06 +02:00
omar	6d78045ff8	Demo: Added extra demo in the Basic Horizontal Layout section. (#1977) + PR guidelines	2018-07-30 14:33:27 +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	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	23b67e6ff5	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-07-17 19:52:14 +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	0c207b7bc9	Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs.	2018-07-17 11:49:41 +02:00
omar	ee98a069f0	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # imgui_demo.cpp	2018-07-16 22:25:36 +02:00
omar	d3be9185b3	Demo: Fixed spacing from b629f90 change.	2018-07-16 22:24:39 +02:00
omar	73e13a0762	Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.	2018-07-16 22:17:34 +02:00
omar	badde9a970	Demo: Spacing.	2018-07-12 11:58:50 +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	b629f90393	Demo: Re-ordered example app code to match their menu order and forward declaration order + added header to delimitate them.	2018-07-12 11:42:33 +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	6201cad2b4	Examples: Comments, Demo: Log early out, TODO. (#1553)	2018-07-09 11:43:53 +02:00
omar	17efd7b3b0	Demo: Added basic Drag and Drop demo. (#143, #1931)	2018-07-08 20:06:49 +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	62b3d7c51e	Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914)	2018-06-29 16:36:40 +02:00
omar	c38fe6b0e1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-06-26 12:41:36 +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	c1d8dee6c5	Version 1.63 WIP	2018-06-25 09:40:09 +02:00
omar	fb0106fad2	Demo: Fixed incorrect response to Begin() returning false in overlay demo (which cannot happen since we don't have a title bar, but that doesn't make it a good behaving demo!).	2018-06-25 09:32:55 +02:00
omar	00418d13e3	Demo: Fixed mismatched TreePush/TreePop in Property Editor, due to incorrect revert in 826d77185e (#1895)	2018-06-22 17:45:03 +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	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	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	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	3569d74f98	Demo: Moved test of the Hovered/Active/Focused functions to the Widgets section.	2018-06-12 18:51:23 +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	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	2bdf0b54a2	Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().	2018-06-05 15:34:22 +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	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	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	d5c8f404b2	Remove trailing white spaces.	2018-05-17 14:12:37 +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	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	d7cc4bc317	Demo: Tweaked custom rendering custom, added a Thickness drag. Clarified use of vertical/horizontal line. Add a single pixel demo (wowow)	2018-05-13 23:42:19 +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	d53bae4c14	Demo: Fixing build due to using INT_MAX, UINT_MAX, LLONG_MAX, ULLONG_MAX.	2018-05-12 18:58:59 +02:00
omar	8adbf081af	Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!	2018-05-12 18:07:22 +02:00
omar	a7a1b3b0a7	Demo: Added demo for DragScalar(), InputScalar(), SliderScalar(). (#643)	2018-05-12 17:53: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	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	787a475650	Skip missing font glyphs to 1) avoid using space for missing glyphs and 2) allow merging fonts with overlapping ranges. Demo: Fixed displaying ? instead of greyed out empty box. (#1671, #1703)	2018-05-07 18:03:00 +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	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	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	429f48bb4f	Clarified usage of ListBoxHeader() before we rename those functions + fixed demo code that didn't honor it correctly. (#1783)	2018-04-29 12:20:22 +02:00
Branimir Karadžić	d317951b37	Demo: Fixed demo from using obsolete functions.	2018-04-28 10:33:48 +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	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	e3453d0dc4	Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).	2018-04-25 17:58:53 +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	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	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	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	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
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	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	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	72b7f48870	Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments	2018-04-06 18:12:21 +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	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	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	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	166411287f	Demo: Added more complete Combo demo. (#1658)	2018-03-19 14:44:37 +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	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	f6fc28dfd2	Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)	2018-03-12 17:50:32 +01:00
omar	111ea7af77	Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.	2018-03-12 17:24:15 +01:00
omar	1f6ad7a894	ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d	2018-03-10 10:33:12 +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	945f4d1ecd	Removed redundant semi colons. (#1653)	2018-03-05 16:16:27 +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	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	b3594a6407	Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)	2018-02-28 21:16:47 +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	45cbebad64	Added dummy io.DisplayPos field.	2018-02-18 21:04:17 +01:00
omar	4ec931853e	Demo: Fonts; Added Font Offset.	2018-02-13 21:03:30 +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	5c83b55d04	Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. (#787)	2018-02-05 15:49:35 +01:00
omar	8ad88f725c	Nav: Minor tidying up. (#787)	2018-02-05 14:53:22 +01:00
omar	efbd8cebe7	Nav: Comments (#787)	2018-02-01 22:53:08 +01:00
omar	eaa6f490a2	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2018-01-31 23:38:05 +01:00
omar	dbdbf01b9f	Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.	2018-01-31 23:35:54 +01:00
omar	38d45ee73f	Demo: Tweaked the Child demos, added a menu bar to the second child to test some navigation functions.	2018-01-31 19:13:20 +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	cca9c3e3da	Examples: Using Dark theme by default. (#707). Tweaked demo code.	2018-01-31 00:15:47 +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	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	6f366fff6b	Demo: Tweaked example menu with colors + menu items, was currently particularly inconvenient for Nav. Will rework later. (#787)	2018-01-24 17:41:47 +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	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	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	cd7e178eac	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2018-01-11 16:49:59 +01:00
omar	a8bbb0b7dd	Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.	2018-01-11 15:47:07 +01:00
omar	12aa3cb09e	Demo: Tweaks format.	2018-01-11 15:22:33 +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	2b8224692e	Merge branch 'master' into navigation	2018-01-03 20:26:24 +01:00
omar	a7deb3a394	Demo: Minor tweaks.	2018-01-03 15:36:51 +01:00
omar	9fbecac87e	Demo: Improved Selectable() examples. (#1528)	2018-01-03 15:11:14 +01:00
omar	05ec0b0736	Casing tweaks + clarify license copyright (simpler/safer?) (#1346)	2018-01-03 14:32:16 +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	7a15fc8de5	Merge branch 'master' into navigation	2017-12-29 18:28:23 +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	4ba2e85744	Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.	2017-12-28 23:53:27 +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	9511f22e8b	Demo: Console: More friendly to text color changes.	2017-12-25 18:47:44 +01:00
omar	e916310b2e	Version 1.53	2017-12-25 17:41:41 +01:00
omar	3d48f5b8c2	Demo: BeginCombo() demo code	2017-12-25 17:41:02 +01:00
omar	de5c304b49	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-24 18:59:40 +01:00
omar	8d54b1b7af	Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)	2017-12-24 18:59:14 +01:00
omar	1b86e7343f	Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).	2017-12-24 18:16:22 +01:00
omar	cead207535	Comments	2017-12-24 17:58:41 +01:00
omar	ffb4f6ca8c	Merge branch 'master' into navigation	2017-12-23 16:27:48 +01:00
omar	983d8f5f8e	Various zealous warning fixes (Clang).	2017-12-23 15:28:49 +01:00
omar	1c1e490316	Merge branch 'master' into navigation	2017-12-22 20:21:54 +01:00
omar	e1a103b251	Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. (#143)	2017-12-22 20:20:52 +01:00
omar	287380261c	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-12-21 19:55:21 +01:00
omar	996dfb21cf	ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.	2017-12-21 19:49:54 +01:00
omar	6497f5dc1b	Merge branch 'master' into navigation ... # Conflicts: # imgui.h	2017-12-15 11:59:50 +01:00
omar	eefea0588a	Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (#1380, #1502)	2017-12-14 18:42:41 +01:00
omar	fa68cb5364	Demo: Console: Tweak.	2017-12-13 23:07:07 +01:00
omar	cc3192f347	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-12-13 22:09:08 +01:00
omar	3905816082	Added ShowFontSelector(), ShowStyleSelector(). (#707)	2017-12-13 21:59:16 +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
Branimir Karadžić	ef1a683ebe	Removed use of obsolete ImGui API.	2017-12-12 17:59:09 +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	6190ab0084	Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()	2017-12-12 14:14:58 +01:00
omar	08b72eb5c0	IsWindowFocused() refactor will flags. (#1382) ... Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow). Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).	2017-12-12 14:07:12 +01:00
omar	8d8f4934fb	Demo: mouse dragging demo tweaks	2017-12-12 13:11:40 +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	2b9d8ab91d	Merge branch 'master' into drag_and_drop ... # Conflicts: # imgui.cpp # imgui.h	2017-12-11 16:39:27 +01:00
omar	38bfdb357e	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-12-11 16:28:47 +01:00
Branimir Karadžić	e67f3809ed	Replaced obsolete function with new one.	2017-12-11 09:57:05 +01:00
omar	d1db229907	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2017-12-10 19:01:59 +01:00
omar	71296910a0	Demo: Tweaks and spacing. Stopped using rand() function in demo code.	2017-12-10 18:49:47 +01:00
omar	4b8857d536	Demo: About box tweaks.	2017-12-10 18:45:05 +01:00
omar	20ba79aa56	Demo: Added "No close" option.	2017-12-10 17:02:41 +01:00
omar	871a5cecc1	Merge branch 'master' into navigation	2017-12-08 18:32:46 +01:00
omar	c9f0275e22	Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.	2017-12-08 18:32:12 +01:00
omar	a4863e8084	Demo: Picker with palette demo supports drag and drop. (#143, #346)	2017-12-08 12:49:35 +01:00
omar	e6215b6ca0	Merge branch 'master' into navigation + merge fix ... # Conflicts: # imgui.cpp	2017-12-07 16:42:52 +01:00
omar	abe5ad3c7a	Demo: Added display for IsMouseDragging() function.	2017-12-07 13:27:55 +01:00
omar	94bf12f14b	Demo: Display better mouse cursor info for debugging backends.	2017-12-07 13:27:49 +01:00
omar	81cbaef806	Merge branch 'master' into navigation	2017-11-29 23:49:17 +01:00
omar	0d53c8d480	Demo: Console: Fixed incorrect positioning which was hidden by a minor scroll issue (this would affect people who copied the console code as is)	2017-11-29 23:48:32 +01:00
omar	a20fe279c5	Demo: Layout: Removed unnecessary BeginChild/EndChild calls	2017-11-29 23:48:32 +01:00
omar	9191b17218	Merge branch 'master' into navigation	2017-11-28 17:28:08 +01:00
omar	532f564fd3	ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().	2017-11-27 19:02:00 +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
omar	3c5e64db78	Demo: Tweaked Image() code.	2017-11-20 13:30:25 +01:00
omar	9848a7023b	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-11-19 16:21:21 +01:00
omar	28a31997b7	Style Editor: Simplified settings also show PopupBorderSize as a checkbox. (#707, #1019)	2017-11-19 16:03:42 +01:00
omar	abbf836fd0	Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. (#707, fix #819, #1031, ref #1019, ref #447)	2017-11-19 15:56:51 +01:00
omar	4cdd998be8	Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. (#1450, #1451)	2017-11-19 00:49:23 +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	d7af1a218e	Style: Added PopupRounding setting. (#1112)	2017-11-19 00:29:29 +01:00
omar	0a61b7195c	Style: Added a default StyleColorsLight(). (#707)	2017-11-19 00:29:29 +01:00
omar	e7e81b265d	Demo: Tweaks.	2017-11-18 23:44:16 +01:00
omar	1c41603b31	Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. (fix #1211)	2017-11-18 23:44:16 +01:00
omar	c1b5eab868	Style Editor: Sneakily adding a combo box to change colors (#707)	2017-11-18 23:18:18 +01:00
omar	bd4bc929ce	Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.	2017-11-18 18:28:21 +01:00
omar	6817f3a3d9	Merge branch 'master' into navigation	2017-11-15 23:44:50 +01:00
omar	27fd1b913b	Made it guaranteed by API that after calling Begin() the last Item represent the title bar. (#823)	2017-11-15 14:35:45 +01:00
omar	64031852de	Merge branch 'master' into navigation	2017-11-14 23:17:58 +01:00
omar	6001d9c7a4	Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). (#125) ... Demo: Columns: Adding a billion of extra lines and using clipper.	2017-11-14 22:41:54 +01:00
omar	0858c3d7cb	Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.	2017-11-14 22:21:38 +01:00
omar	a297cbafdb	Merge branch 'master' into navigation	2017-11-08 23:17:14 +01:00
omar	8e6adc78af	Examples: Constrained Resize: Added more test cases (for #1417)	2017-11-07 11:38:39 +01:00
omar	0d4c320f88	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_draw.cpp	2017-11-06 23:58:28 +01:00
omar	ff4d4ca651	IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) (#1382, #1404)	2017-11-02 16:44:24 +01:00
omar	63f6f2dd13	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h	2017-11-01 15:09:23 +01:00
omar	59323b54da	Demo: Comments (#1408)	2017-11-01 12:57:12 +01:00
omar	6ab20ff9bf	Minor tweaks to the user guide.	2017-11-01 12:33:58 +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	fc25881207	Merge branch 'master' into navigation	2017-10-24 21:13:24 +02:00
omar	1f3372b7f1	ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. (#1038)	2017-10-24 20:48:29 +02:00
omar	d769e2515a	Merge branch 'master' into navigation	2017-10-23 10:05:36 +02:00
omar	fce41d0b55	Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.	2017-10-22 10:21:49 +02:00
omar	e4bb9102f9	Merge branch 'master' into navigation	2017-10-20 20:32:17 +02:00
omar	6ab737a4bb	Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)	2017-10-20 20:31:01 +02:00
omar	1172ff62e1	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2017-10-20 18:10:07 +02:00
omar	695ea45fca	IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143)	2017-10-20 17:59:48 +02:00
omar	564ff2dfd3	IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013, #143, #925) ... The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now. Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup. Demo: Added tests for those two functions.	2017-10-20 17:52:22 +02:00
omar	2a32a2e662	Demos: Tweaks of popups/context/menus section.	2017-10-20 12:38:48 +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	d96b6ecf88	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2017-10-17 16:20:35 +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	1a35766356	BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.	2017-10-16 23:37:12 +02:00
omar	3833f1f7a2	Merge branch 'master' into navigation	2017-10-11 15:38:33 +02:00
omar	43b4a81b3e	Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).	2017-10-11 15:36:57 +02:00
omar	c6e370a77a	TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag	2017-10-11 15:16:11 +02:00
omar	59c6f35bf6	Added ActivateItem(), GetItemID() functions.	2017-10-05 21:34:01 -07:00
omar	518f02f4de	Demo: better demo for SetKeyboardFocusHere()	2017-10-05 18:10:59 -07:00
omar	0046c618b0	Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight (#787, #1079)	2017-09-30 00:47:07 +02:00
omar	cf308f4039	Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer (#787)	2017-09-29 00:20:51 +02:00
omar	3b85a8b6a0	Demo: Added an extra test related to baseline and fixed an id collision.	2017-09-28 22:01:08 +02:00
omar	7c2926de17	Demo: Added an extra test related to baseline and fixed an id collision.	2017-09-28 20:15:32 +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	cc26db8ec7	Merge branch 'master' into navigation	2017-09-27 17:25: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	8fd4beddb8	Merge branch 'master' into navigation	2017-09-26 20:28:40 +02:00
omar	9e1ad7295f	ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.	2017-09-26 20:05:16 +02:00
omar	10bb9524eb	ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.	2017-09-26 19:54:30 +02:00
omar	7e8069dd23	Merge branch 'master' into navigation	2017-09-25 22:08:38 +02:00
omar	a34edb810e	Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes)	2017-09-25 21:12:07 +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	1ff27d7db8	Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. (#787)	2017-09-18 16:04:28 +02:00
omar	44e8d94aba	Merge branch 'master' into navigation	2017-09-18 15:32:31 +02:00
omar	709653c330	Merge branch 'master' into styles	2017-09-18 15:03:25 +02:00
omar	38ed66f55e	Merge branch 'master' into navigation ... # Conflicts: # imgui_demo.cpp	2017-09-06 19:25:07 +02:00
omar	9e2f202f05	Demo: Not using the undesirable Begin() overload.	2017-09-06 19:24:08 +02:00
omar	5c4fda0fbc	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-06 19:17:51 +02:00
omar	6a1ba317c7	Demo: Minor coding style tweaks so bgfx copy needs less patching.	2017-08-29 19:05:56 +08:00
omar	807322c9a5	Merge branch 'master' into navigation ... # Conflicts: # imgui.cpp	2017-08-26 18:43:10 +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	82c3116b4f	Demo: Displaying version number in test window.	2017-08-24 17:32:03 +08:00
omar	444792f75f	Merge fixes from ,master branch	2017-08-22 18:27:23 +08:00
omar	53e73182ff	Merge branch 'master' into navigation ... # Conflicts: # imgui_internal.h	2017-08-21 00:04:45 +08:00
omar	54bdd00df7	Columns: Fix for explicit content width and scrollbar. (#519, #125)	2017-08-20 21:32:18 +08:00
omar	1ebd7ec049	Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)	2017-08-20 20:58:24 +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	b4eeb4aa8d	Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.	2017-08-20 17:53:09 +08:00
omar	91d841dd5f	Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)	2017-08-20 15:28:12 +08:00
omar	bf0d9c123e	Merge branch 'master' into navigation	2017-08-18 00:25:12 +08:00
omar	24a78767d2	Merge branch 'master' into styles ... # Conflicts: # TODO.txt	2017-08-17 17:24:33 +08:00
omar	52f1a4124c	Demo: Tweaked Fonts section.	2017-08-17 13:56:16 +08:00
omar	68bf5ecbc1	Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME	2017-08-16 17:51:44 +08:00
omar	668a4bf1bc	Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update	2017-08-15 17:48:41 +08:00
omar	18b50f8eba	Comments	2017-08-15 11:41:36 +08:00
omar	9bf5028fd3	Merge branch 'master' into navigation	2017-08-15 00:50:59 +08:00
omar	97fccbdb73	Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.	2017-08-14 13:05:03 +08:00
omar	5eef7dd82f	Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard	2017-08-12 00:43:55 +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	059e838b2c	Merge branch 'master' into navigation	2017-08-08 18:04:38 +08:00
omar	be9628494a	Demo: Rearranged everything under Widgets in a more consistent way.	2017-08-08 18:04:31 +08:00
omar	d888de4483	Demo: Merged a few demo tweaks from navigation branch to minimize drift.	2017-08-08 17:49:12 +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	d952a8d3bf	Demo: Color widget demo tweaks (#346)	2017-08-08 14:49:45 +08:00
omar	03700ad15e	Merge remote-tracking branch 'origin' into 2016-07-navigation	2017-08-07 22:51:18 +08:00
omar	1c991b525a	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2017-08-07 22:34:30 +08:00
omar	e36b41cbd0	Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.	2017-08-07 21:53:57 +08:00
omar	233a6efeba	Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)	2017-08-07 18:35:15 +08:00
omar	cdea8ca94f	Demo: Comment about 'static' and some tweaks (#1267)	2017-08-06 11:07:52 +08:00
omar	f6460970c5	ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)	2017-07-31 21:20:42 +08:00
omar	3075d8bcd4	ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)	2017-07-30 23:08:43 +08:00
omar	91a4f5df25	Demo: Tweaks	2017-07-30 18:28:59 +08:00
omar	90fcd4a829	Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)	2017-07-30 17:55:42 +08:00
omar	4d844ffde1	Demo: custom ColorPicker popup example tweaks (#346)	2017-07-30 17:43:19 +08:00
omar	f040547a5f	Demo: custom ColorPicker popup example (#346)	2017-07-30 17:37:28 +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	35186a1165	Demo: Comments (#346)	2017-07-29 17:35:24 +08:00
omar	3926bd08e1	ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)	2017-07-29 17:23:32 +08:00
omar	6bc1572d31	ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)	2017-07-29 15:50:24 +08:00
omar	973d4a361b	ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)	2017-07-29 14:32:41 +08:00
omar	cdcda9ff68	ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346)	2017-07-29 14:01:05 +08:00
omar	c36d59a42a	ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346)	2017-07-27 17:16:46 +08:00
omar	b7a563276d	ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)	2017-07-27 11:07:46 +08:00
omar	2e37db9002	ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)	2017-07-27 10:49:01 +08:00
omar	6796e771fd	ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.	2017-07-26 16:28:01 +08:00
omar	d29a4c5e5c	Demo: Removed the color button from the context menu example because it is misleading now that our color widget have tooltip/context menus themselves. (#346)	2017-07-26 16:00:47 +08:00
omar	7b2d79cffd	ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346)	2017-07-23 18:44:32 +08:00
omar	4def2ce339	ColorPicker: Demo tweaks (#346)	2017-07-23 17:55:39 +08:00
omar	790d0eb5be	ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)	2017-07-22 19:24:39 +08:00
omar	91bf8fd689	ColorPicker,ColorEdit: Demo code (#346)	2017-07-22 18:01:29 +08:00
omar	c8553817d9	Merge branch 'master' into 2016-02-colorpicker	2017-07-21 02:34:19 +08:00
omar	100d30a0a1	Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)	2017-07-20 23:12:58 +08:00
omar	3e4cb40d45	Merge branch 'master' into 2016-02-colorpicker	2017-07-19 14:53:25 +08:00
omar	8261d9ff30	Comments (#1172, #1231)	2017-07-15 17:11:53 +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	8228dc20df	Merge branch 'master' into 2016-07-navigation	2017-05-26 13:44:08 +02:00
omar	c038339a4c	Merge branch 'master' into 2015-02-colorpicker	2017-05-26 13:43:36 +02:00
omar	026d021df1	Demo: Fixed warnings introduced in 0828a1fd6c	2017-05-26 13:40:53 +02:00
omar	0828a1fd6c	Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account	2017-05-14 16:27:10 +02:00
omar	497381dc3d	Comments	2017-05-01 15:53:50 +02:00
omar	89b1497843	Merge branch 'master' into 2016-02-colorpicker	2017-05-01 12:37:34 +02:00
omar	288dccd5a5	Merge branch 'master' into 2016-07-navigation	2017-03-17 21:30:16 +01:00
omar	e10ceebd36	ImFont: Store the texture surface used to get an idea of how costly each font is.	2017-03-17 21:29:57 +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	714beb217c	Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.	2017-01-07 20:18:45 +01:00
ocornut	68df09cf47	Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)	2017-01-01 20:11:40 +01:00
ocornut	a60b2cc645	Merge branch 'master' into 2016-02-colorpicker	2016-12-23 12:15:58 +01:00
ocornut	fdc70456f4	Merge branch 'master' into 2016-07-navigation	2016-12-23 12:13:52 +01:00
ocornut	52308a54f8	Demo: comments	2016-12-12 11:05:41 +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
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	fdbad2708c	Ignore GCC 6 warnings (#883)	2016-11-12 21:04:55 +01:00
ocornut	775ac24d45	Fixed overzealous GCC warnings (#883) + partly undo 8553bab241	2016-11-12 11:14:37 +01:00
ocornut	8553bab241	Ignoring overzealous GCC warnings (#883)	2016-11-11 20:17:35 +01:00
ocornut	941cf1b436	Merge branch 'master' into 2016-07-navigation	2016-11-09 15:21:36 +01:00
ocornut	ccb3db94da	Merge branch 'master' into 2016-02-colorpicker	2016-11-09 15:17:20 +01:00
ocornut	faafcf418d	Demo: Comments, even though nobody appears to read the comments.	2016-11-07 17:33:46 +01:00
ocornut	b2f0ea6c0d	Font: Default font given explicit name "ProggyClean.ttf"	2016-11-06 21:51:20 +01:00
ocornut	b376b68326	Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code	2016-11-06 21:50:18 +01:00
ocornut	357167f917	Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.	2016-11-06 18:13:14 +01:00
James Fulop	6fa3aaf7c0	outdated dragging API mentioned in demo text ... Looks like you changed the API on dragging, but did not update the description text for it. https://github.com/ocornut/imgui/issues/167	2016-10-16 12:21:38 -04:00
ocornut	e4deb7a190	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-10-07 09:52:14 +02:00
ocornut	404979e48d	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-10-07 09:52:00 +02:00
Jeongseok Lee	1d7e05327b	Fix clang warning: unknown warning group '-Wreserved-id-macro'	2016-10-06 14:48:47 -04:00
Michał Cichoń	1999c01db8	Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.	2016-09-26 12:00:33 +02:00
ocornut	82dcdc9dfc	ShowStyleEditor: tweak font map display to show glyph details when hovered.	2016-09-25 15:52:04 +02:00
ocornut	f5b37dbc52	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 15:31:36 +02:00
ocornut	fea0fcb7c3	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 15:25:55 +02:00
ocornut	d7c518e6cc	ShowStyleEditor: show font map / grid in more details.	2016-09-25 15:22:41 +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	612b17ef57	Fixing minor english typos (#827)	2016-09-11 22:02:35 +02:00
ocornut	ef10b984fe	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-23 17:00:47 +02:00
ocornut	67fd805839	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-08-21 16:13:40 +02:00
ocornut	252f094101	Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() (#323)	2016-08-21 15:26:40 +02:00
Max Thrun	4f389b7f6a	Add null terminator to ShowStyleEditor output_type combo options ... Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.	2016-08-18 11:00:23 -07:00
ocornut	996eb080fa	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-11 22:53:26 +02:00
ocornut	785f51227a	Demo tweaks	2016-08-07 19:07:24 +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	4e91b521ee	Demo: Arrange some inputs panels.	2016-08-03 20:55:54 +02:00
ocornut	d0801057ba	Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running.	2016-08-01 20:55:54 +02:00
ocornut	a154625a56	Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work (#323)	2016-07-31 13:40:14 +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