1208 Commits

Author	SHA1	Message	Date
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
ocornut	d88dcc26cc	Demo: console text input keeps focus in a less harsher and more navigation friendly way (#323)	2016-07-30 19:17:26 +02:00
ocornut	e2dd48ae65	Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus (#323)	2016-07-30 18:06:05 +02:00
ocornut	04157da291	Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) (#323)	2016-07-30 17:18:34 +02:00
ocornut	c2cb2a6928	Gamepad/Keyboard navigation support, initial commit, WIP (#323)	2016-07-20 00:02:59 +02:00
ocornut	e72e3b2cbc	Demo: tweaks.	2016-07-18 18:22:06 +02:00
ocornut	91e1c56da6	Minor bits.	2016-07-18 15:25:59 +02:00
ocornut	de61fcc619	Minor bits	2016-06-25 17:03:49 +02:00
ocornut	1ef7980e17	Merge branch 'master' into 2016-02-colorpicker	2016-06-15 10:05:17 +02:00
ocornut	4fddfa4b5e	Demo: extra (somehow duplicate) Selectables+Columns demo	2016-06-07 09:05:36 +02:00
ocornut	d6a5fd06d7	Demo: Added an extra 3-way columns demo	2016-06-07 08:46:50 +02:00
ocornut	d1c073a199	Comments, tweaks	2016-05-31 00:00:44 +02:00
ocornut	5d4cf1c3f3	Version 1.50 WIP	2016-05-30 19:38:36 +02:00
ocornut	adb85d800d	Version 1.49	2016-05-29 19:16:44 +02:00
ocornut	3ddb50a925	Merge branch 'master' into 2016-02-colorpicker	2016-05-29 19:07:23 +02:00
ocornut	1483a69c11	Demo: Tree: showing how to align tree node label with current x position (#324, #581)	2016-05-28 19:30:01 +02:00
ocornut	a0a48f6e59	Added TreeAdvanceToLabelPos() (#581)	2016-05-28 18:15:54 +02:00
ocornut	806a146198	TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581)	2016-05-28 17:12:13 +02:00
ocornut	b5521a81d4	Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection (#581)	2016-05-28 14:18:46 +02:00
ocornut	8f4b123e1b	SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668)	2016-05-28 14:02:14 +02:00
ocornut	e3d8055d90	Speculative 64-bit warning fix (#668)	2016-05-21 23:13:11 +02:00
ocornut	b7ebeb1610	Added SetNextWindowSizeConstraint() + demo code (#668)	2016-05-21 22:53:08 +02:00
ocornut	102d03a7eb	Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. (#668) ... Storing ActiveIdClickOffset to generalize pattern already used by columns.	2016-05-21 20:50:15 +02:00
ocornut	69a29e4715	Added NewLine() (very shy reminder that #97 isn't done)	2016-05-16 20:14:07 +02:00
ocornut	7a28f5bb81	ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662)	2016-05-16 19:22:51 +02:00
ocornut	fa5ae60bce	Demo: added decorated label to some vertical sliders.	2016-05-16 12:05:26 +02:00
ocornut	339e191c53	Demo: Console: Add a "Scroll to bottom" button (#662)	2016-05-15 18:08:41 +02:00
ocornut	9e6ed0991d	Demo: clarified misleading example (#660)	2016-05-15 16:03:15 +02:00
ocornut	a2a5d71582	Demo: Tweak irritating pink color.	2016-05-12 23:13:54 +02:00
ocornut	b628acbb52	StyleEditor: comments (#652)	2016-05-12 20:59:20 +02:00
omar	10d3da6b73	Merge pull request #641 from cosmy1/errors-fix ... Fix compilation errors when disabling test windows.	2016-05-12 13:41:05 +02:00
ocornut	8648346eab	Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability (#615, #604)	2016-05-10 17:02:10 +02:00
Branimir Karadžić	a59a04f4d0	Fixed iOS/OSX build.	2016-05-10 01:10:31 +02:00
cosmy1	4b5a4cae09	Fix compilation errors when disabling test windows.	2016-05-09 00:21:05 +02:00
Sergej Reich	6e8579fc14	Ignore implicit conversion warnings	2016-05-07 18:49:24 +02:00
ocornut	ce4d731486	Minor comments, tweaks	2016-05-07 18:10:32 +02:00
ocornut	79ad22e1f2	Fixed various Clang -Weverything warnings (#626)	2016-05-04 23:17:53 +02:00
ocornut	4ce6cf0512	Demo: Moved "Fonts" section style editor	2016-05-03 20:22:35 +02:00
ocornut	89d5026187	Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625, #579)	2016-05-02 12:32:16 +02:00
ocornut	bb674ccee6	TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag (#581, #324)	2016-05-01 21:15:46 +02:00
ocornut	f79b2d6ce3	TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag (#581, #324, #190)	2016-05-01 20:12:14 +02:00
ocornut	dc8446d048	Demo: Added simple tree node selection demo (#581, #516, #190)	2016-05-01 17:55:04 +02:00
ocornut	df749e3f13	Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. (#600) ... New flag and declaration makes uses of SetNextTreeNode() functions on collapsing header more obvious as well (#579).	2016-05-01 14:34:55 +02:00
ocornut	6bcc31e575	Merge branch 'master' into 2016-02-colorpicker	2016-04-26 11:06:24 +02:00
ocornut	ea6b615179	Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610)	2016-04-26 11:03:51 +02:00
ocornut	7da2d51480	MenuBar fixed missing lower border	2016-04-24 22:36:46 +02:00
ocornut	77177c18f0	Merge branch 'master' into 2016-02-colorpicker	2016-04-09 19:12:03 +02:00
ocornut	1588eda1ac	Version 1.49 WIP	2016-04-09 19:10:42 +02:00
ocornut	95cbcdca3f	Version 1.48	2016-04-09 17:46:48 +02:00
ocornut	4c25de950c	Warning fixes for clang. Using int64_t, may be an issue?	2016-04-09 17:46:38 +02:00
cheriff	2ee76bbff6	Trivial format string fix in demo	2016-04-05 09:23:00 +02:00
ocornut	e808b7cfca	Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. (#337) ... bg_alpha parameter of 5-parameters version of Begin() is an override, however that function may become obsolete someday.	2016-04-04 01:37:02 +02:00
ocornut	4c1d4233b2	Merge branch 'master' into 2016-02-colorpicker	2016-04-03 01:10:26 +02:00
ocornut	a6399f120f	IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) (#473) ... NB: Value not used.	2016-04-02 18:22:40 +02:00
ocornut	326c4e40f8	Merge branch 'master' into 2016-02-colorpicker	2016-03-28 23:17:13 +02:00
ocornut	2b7eeba143	Trim trailing spaces	2016-03-26 15:38:52 +01:00
ocornut	baabe3b62c	Merge branch 'master' into 2016-02-colorpicker	2016-03-23 10:50:37 +01:00
ocornut	5bed7144fe	ImDrawList: Added AddTriangle() function	2016-03-22 20:10:06 +01:00
ocornut	a274a09955	Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340)	2016-03-21 22:29:11 +01:00
ocornut	9cbc6e196b	ImDrawList: AddRect() added optional thickness parameter + updated demo	2016-03-21 21:56:23 +01:00
ocornut	459af7683c	Merge branch 'master' into 2016-02-colorpicker	2016-03-04 13:57:33 +01:00
ocornut	b816d05e33	Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments	2016-03-03 00:30:08 +01:00
ocornut	6846873f23	Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master	2016-03-03 00:18:58 +01:00
ocornut	d45044fe54	CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy	2016-03-03 00:09:41 +01:00
ocornut	cf12bc7dea	InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. (#541)	2016-03-02 23:34:29 +01:00
ocornut	ba80a457b9	Demo: plot code doesn't use ImVector to avoid heap allocation + comment (#538)	2016-02-29 12:53:05 +01:00
ocornut	4afe67cdc8	Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536)	2016-02-24 11:50:21 +01:00
ocornut	f8fede1d8b	Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346) ... Still pretty much experimenting so may break API	2016-02-21 23:23:30 +01:00
ocornut	dafedc3246	Demo: use locally defined strdup because compilers/standard librairies are an annoyance (#520)	2016-02-08 08:44:45 +01:00
ocornut	2c6bc95dd5	Demo: InputText password demo filters out blanks (#515)	2016-02-03 09:24:57 +01:00
Nikolay Zapolnov	a908c109c0	Added flag for selectables to handle double clicks.	2016-01-31 22:08:35 +01:00
ocornut	bf6f6ba858	Demo: extra comments and example for PushItemWidth(-1)	2016-01-06 01:24:49 +01:00
ocornut	81c86dd5e7	Various minor fixes following a pass of cppcheck static analyzer	2015-12-30 11:55:37 +01:00
ocornut	68bde7b862	Clarify comment (#455)	2015-12-27 21:41:01 +01:00
ocornut	6dbdc69131	ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457	2015-12-27 20:18:43 +01:00
ocornut	668a247af0	Demo: added more draw primitives in the Custom Rendering example (#457)	2015-12-27 19:49:31 +01:00
ocornut	e41568f87f	Version number 1.48 WIP + Update binaries	2015-12-26 10:02:57 +01:00
ocornut	24d186753e	Version number 1.47	2015-12-25 22:44:03 +01:00
ocornut	e4cf44e967	Minor rebranding "ImGui" -> "dear imgui" (#21)	2015-12-24 20:00:50 +01:00
ocornut	2e5352786a	Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to #414, #282)	2015-12-13 23:41:02 +00:00
ocornut	558430ca8f	TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc)	2015-12-13 22:07:01 +00:00
ocornut	5084f90a0d	Added ProgressBar() (#333)	2015-12-13 21:41:45 +00:00
ocornut	02ce1a2b32	Demo: Display extra info from ImFontConfig in the font display	2015-12-13 16:15:11 +00:00
ocornut	18223fd3ab	Demo: Tweak window option and style display	2015-12-13 14:03:26 +00:00
ocornut	a9bdda0d95	Demo: Added style editor in demo menu + exposed WindowFillAlphaDefault	2015-12-13 13:36:00 +00:00
ocornut	a500c0daf7	Demo: some TreeNode layout examples (#414, #282)	2015-11-29 21:02:15 +00:00
ocornut	4006fb77bc	TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (#414, #282)	2015-11-29 20:35:58 +00:00
ocornut	eb6575508f	Demo: Tweaked Clipping example.	2015-11-29 10:29:06 +00:00
ocornut	b2b4bbe5ea	Demo: Fixed variable shadowing warning.	2015-11-29 10:25:55 +00:00
ocornut	79b09e7d10	Fixed int>void* warnings for 64-bits architectures and fancy warnings	2015-11-29 10:20:50 +00:00
ocornut	ba77166432	Demo: comments (#414)	2015-11-28 17:23:32 +00:00
ocornut	32d2768734	Demo: Moved property editor demo to its own mini example applet (#414)	2015-11-28 17:16:59 +00:00
ocornut	d3df39fed1	Columns: Added Property Tree demo among tidying up demos (#125, #414)	2015-11-28 16:44:09 +00:00
ocornut	807d4ff92c	Columns: minor tidying up while investigating severe issues with indenting within columns (#414)	2015-11-28 12:14:50 +00:00
ocornut	92c518a420	InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374)	2015-11-19 23:09:59 +01:00
ocornut	6b03ddbcb1	Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment (#409)	2015-11-16 22:43:42 +01:00
ocornut	f87deff0f3	Moving stdlib.h include outside of imgui.h (#405)	2015-11-13 17:08:54 +01:00
ocornut	6ffe0fddbf	Examples: Fixed crash when both buttons are held (#393)	2015-10-30 15:01:26 +01:00
ocornut	5f0db60a57	Version number 1.47 WIP	2015-10-18 20:13:01 +01:00
ocornut	72dde4d323	Version 1.46	2015-10-18 17:36:27 +01:00
ocornut	bc34ac882f	InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo	2015-10-18 10:57:29 +01:00
ocornut	f21fda1231	Scrollbar: Tweaked scrollbar inner padding for small scrollbars.	2015-09-30 21:47:44 +02:00
ocornut	5d3d136733	Scrollbar: horizontal scrollbar demo allows to enable simultanaeous scrollbars on both axises.	2015-09-30 21:15:47 +02:00
ocornut	127f44c12b	Demo: Extra plotting examples.	2015-09-20 13:29:18 +02:00
ocornut	c4562ac573	Fixed mouse click detection to be more friendly to DeltaTime 0.0 (#338)	2015-09-17 23:42:34 +01:00
ocornut	0abe668221	ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice(#327)	2015-09-11 16:50:00 +01:00
ocornut	2903c98bca	Minor typo	2015-09-10 10:26:09 +01:00
ocornut	b4f1e88860	Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() (#211)	2015-09-09 09:08:08 +01:00
ocornut	a09411b936	Demo: using MouseDelta	2015-09-07 23:33:44 +01:00
ocornut	965fa3cb16	Version number 1.46 WIP	2015-09-02 19:09:19 +01:00
ocornut	c9e19f8953	Version number 1.45	2015-09-01 20:34:10 +01:00
ocornut	e4ef140e10	Speculative Linux build fix, not using itoa (#246)	2015-08-30 18:55:46 +01:00
ocornut	350d96466e	Demo: tweaks (#246)	2015-08-30 18:43:42 +01:00
ocornut	71026d3655	Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246)	2015-08-30 18:33:38 +01:00
ocornut	e5e9c5cfbe	Demo: removed extraneous flag in demo code + tweak comment (#246)	2015-08-30 18:07:51 +01:00
ocornut	afa0346a0b	Demo: using DragFloat instead of SliderFloat	2015-08-30 17:38:42 +01:00
ocornut	f128a8bce1	ColumnsStartX include window->Scroll.x to simplify code (#246)	2015-08-30 17:25:10 +01:00
ocornut	9e5fb40ddd	Demo: added horizontal scrolling example + enabled in console, log and child examples (#246)	2015-08-30 16:38:55 +01:00
ocornut	d88b73a8b7	Added GetContentRegionAvailWidth() helper. Demo tweaks.	2015-08-30 15:35:59 +01:00
ocornut	aa35547f94	Demo: long text example uses ImGuiListClipper	2015-08-30 00:03:08 +01:00
ocornut	2d565d4bfb	Style: rename ScrollbarWidth to ScrollbarSize (sorry!)	2015-08-29 23:47:47 +01:00
ocornut	62a3142036	Demo: comments.	2015-08-29 13:31:30 +01:00
ocornut	e7cc048d81	Demo: custom rendering tweak.	2015-08-28 15:35:08 +01:00
ocornut	0a11024459	IO.WantInputCharacters -> WantTextInput (#305)	2015-08-28 15:34:53 +01:00
ocornut	8430c88451	Demo: added a bezier curve in the old custom rendering demo.	2015-08-28 14:41:10 +01:00
ocornut	80ad773c87	ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves (#311)	2015-08-28 13:18:34 +01:00
ocornut	b1987d697f	Trim trailing whitespace (#305)	2015-08-24 13:50:18 +02:00
Borislav Stanimirov	73917115a8	Added flag showing whether the GUI wants text input ... Conflicts: imgui.cpp	2015-08-24 13:44:43 +02:00
ocornut	0a6d6da732	Demo: Log: removed unnecessary style change,	2015-08-13 22:11:32 -06:00
ocornut	67b2b5f3a9	Demo: Log: removed broken clipping, tweaks.	2015-08-13 22:04:31 -06:00
ocornut	07de0448f9	ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values	2015-08-13 21:51:34 -06:00
ocornut	b770f3ffaf	Demo: Add filtering to log with better-than-none storage of line offsets.	2015-08-13 21:47:50 -06:00
ocornut	72d3fca52f	Demo: added simple Log demo	2015-08-13 20:59:37 -06:00
ocornut	d36a634ac8	Demo: Fixed incorrectly formed string passed to Combo (#298)	2015-08-13 11:55:48 -06:00
omar	9a97ef673e	Merge pull request #296 from tpoechtrager/master ... Fixes for compiling Windows target with non-MSVC compiler.	2015-08-09 10:49:06 -06:00
ocornut	6a90ac2094	Tentative GCC/Clang warning fixes with unused functions (cf #296)	2015-08-09 10:45:58 -06:00
Thomas Pöchtrager	3604aecf8f	Minor Windows adjustments	2015-08-09 17:24:10 +02:00
ocornut	23e7bdebcf	Warnings for clang (#295)	2015-08-08 12:30:56 -06:00
ocornut	aa3c26fd30	IM_PRINTFARGS takes one argument. Moved pragma outside of .h (#295)	2015-08-08 12:26:22 -06:00
ocornut	b637850260	Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master	2015-08-08 12:18:59 -06:00
ocornut	14822609bd	Version number 1.45 WIP	2015-08-08 12:18:37 -06:00
Thomas Pöchtrager	947cf3434f	Added printf attribute to printf like text formatting functions	2015-08-08 19:29:11 +02:00
ocornut	a99ba42a39	Version number 1.44	2015-08-08 07:57:29 -06:00
ocornut	155873a6b0	Added GetContentRegionAvail() helper	2015-08-05 10:43:12 -06:00
ocornut	1befd21b37	Moved ShowUserGuide() after ShowTestWindow() (#219)	2015-08-05 09:31:03 -06:00
ocornut	3658314638	imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built (#219)	2015-08-05 09:28:19 -06:00
ocornut	e47bf041bf	Clang warning fixes	2015-08-01 21:37:32 -06:00
ocornut	e1ac5a3198	Honor IMGUI_DISABLE_TEST_WINDOWS as described (#219)	2015-07-21 19:57:32 -06:00
ocornut	5a29eef1fa	Fixed further warnings with GCC/Clang (#219)	2015-07-21 17:13:56 -06:00
ocornut	dace68b6fd	Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219)	2015-07-21 17:00:28 -06:00