imgui

mirror of https://github.com/Drezil/imgui.git synced 2024-12-20 23:06:36 +00:00

Author	SHA1	Message	Date
omar	b3594a6407	Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)	2018-02-28 21:16:47 +01:00
omar	2c9f45bbe7	Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787 )	2018-02-28 18:51:40 +01:00
omar	27667fc035	TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079 )	2018-02-25 14:15:37 +01:00
omar	79969931e6	ImDrawList: PushTextureID(): Removed unnecessary param by reference.	2018-02-23 00:01:34 +01:00
omar	2c3c5125b3	Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. (#143 , #1637 )	2018-02-21 21:33:58 +01:00
omar	1399c9c8a9	Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.	2018-02-18 20:21:21 +01:00
omar	7c75835200	Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626 )	2018-02-16 19:49:33 +01:00
omar	63332d152a	Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599 ) Examples: Updated examples.	2018-02-16 19:18:16 +01:00
omar	30c469f7c5	ImFont: DisplayOffset.y defaults to 0 instead of +1.	2018-02-15 10:46:28 +01:00
omar	024e23c4d7	Comments, moved ImFontAtlas::Flags to "public" area.	2018-02-14 12:04:21 +01:00
omar	fed0a884f7	ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. (#1613 )	2018-02-14 11:58:52 +01:00
omar	9263bd68db	Fixed legacy forward function IsRootWindowOrAnyChildHovered() broken by `a63fbbca8b`	2018-02-13 21:03:30 +01:00
omar	7cc1bc7635	Added IsAnyMouseDown() helper. Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.	2018-02-10 16:50:19 +01:00
omar	88dcbeb7ff	Styles: Comments and re-ordered.	2018-02-08 21:14:57 +01:00
omar	8099f8c270	Comments	2018-02-06 23:19:53 +01:00
omar	7c16d52f72	Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565 , #787 )	2018-02-06 20:20:34 +01:00
omar	f0364aa359	Merge branch 'context' # Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx9_example/main.cpp # examples/marmalade_example/main.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp	2018-02-06 20:16:03 +01:00
omar	4e5b7612ae	Nav: Documentation tweaks. (#787 )	2018-02-06 20:10:05 +01:00
omar	3171f90a1a	Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787 )	2018-02-06 19:54:30 +01:00
omar	9e3a807813	Removed comments	2018-02-06 19:34:09 +01:00
omar	057807f4a7	Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787 )	2018-02-06 19:29:31 +01:00
omar	7e32fc7109	Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787 )	2018-02-06 19:23:12 +01:00
omar	ed4bbc4fd4	Nav: Comments, guides.	2018-02-06 18:48:31 +01:00
omar	cea8017e0b	Merge branch 'master' into context	2018-02-06 18:04:44 +01:00
omar	3b7bd4563a	ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.	2018-02-06 16:35:32 +01:00
omar	ad09396672	ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.	2018-02-06 16:32:51 +01:00
omar	92ee6b1185	Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787 )	2018-02-05 16:07:54 +01:00
omar	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	0bd15b52a6	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2018-02-04 13:16:13 +01:00
omar	147ec8d1e2	Style Added style.MouseCursorScale, may remove (#939 ).	2018-02-04 12:17:35 +01:00
omar	ce9d7baaba	Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (#787 , #1079 )	2018-02-02 17:47:05 +01:00
omar	27980d9688	Merge branch 'master' into context	2018-01-31 16:02:26 +01:00
omar	23c11e9764	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2018-01-31 15:43:19 +01:00
omar	dd41a1650a	Comments	2018-01-31 15:41:48 +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	2933e6765c	Merge branch 'master' into navigation	2018-01-29 17:42:39 +01:00
omar	94090eb08f	Added IMGUI_USER_CONFIG to define a custom configuration filename. (#255 , #1573 , #1144 , #41 )	2018-01-28 17:47:28 +01:00
omar	578016d08b	ImVector comment (#1577 )	2018-01-27 17:26:59 +01:00
omar	f2d5300408	Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787 )	2018-01-25 19:03:47 +01:00
omar	e9070e768e	Nav: Fixed renaming of `c09016b12a` that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787 )	2018-01-25 16:17:36 +01:00
omar	5f7f27c8de	Nav: Comments. (#787 )	2018-01-24 20:07:35 +01:00
omar	f3776055d6	Merge branch 'master' into context	2018-01-24 19:31:11 +01:00
omar	455989b8b1	Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787 )	2018-01-24 17:41:47 +01:00
omar	c09016b12a	Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787 )	2018-01-24 17:41:47 +01:00
omar	bd278e958e	Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787 )	2018-01-24 17:41:47 +01:00
ocornut	680162eb32	Merge branch 'master' into navigation	2018-01-24 17:41:14 +01:00
omar	823e1f0b94	Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments (#787 )	2018-01-24 10:43:57 +01:00
omar	eb7ec781dc	Nav: Tweak GetNavInputAmount(). Split debug defines.	2018-01-23 21:56:15 +01:00
omar	f6ee8d30fb	Comments (#1567 )	2018-01-23 19:21:17 +01:00
omar	d500113f1d	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_demo.cpp	2018-01-23 19:16:43 +01:00
omar	9a76fd30fd	Added SetNextWindowBgAlpha() helper. (#1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.	2018-01-23 19:13:49 +01:00
omar	2645ab5f7f	Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes `6190ab0084`	2018-01-23 17:25:59 +01:00
omar	13c407591e	Nav: Comments, tweaks	2018-01-23 16:45:46 +01:00
omar	9076366c17	Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181 )	2018-01-23 09:57:49 +01:00
omar	9edf211c0e	Merge branch 'master' into navigation	2018-01-21 20:46:50 +01:00
omar	5e2aa6185c	Reorganized context handling to be more explicit, - YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END. - removed Shutdown() function, as DestroyContext() serve this purpose. - you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance. - removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts. - removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts (#1565, #586, #992, #1007, #1558)	2018-01-21 20:16:54 +01:00
omar	7e4d28a49d	Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (#1565 , #586 , #992 , #1007 , #1558 )	2018-01-21 20:16:54 +01:00
omar	5a301c29dc	Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565 , #586 , #992 , #1007 , #1558 )	2018-01-21 20:16:54 +01:00
omar	5eb293c879	ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)	2018-01-20 20:32:23 +01:00
omar	cd1409f4bf	ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939 )	2018-01-20 20:25:12 +01:00
omar	0b1fecb792	Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463 )	2018-01-20 12:36:16 +01:00
omar	6f6b6194b2	Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel # Conflicts: # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp	2018-01-20 12:06:06 +01:00
omar	8877622fa8	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2018-01-19 15:42:28 +01:00
omar	c2ffce3e5a	Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143 )	2018-01-18 17:39:40 +01:00
omar	63d47e8328	Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143 )	2018-01-18 17:32:34 +01:00
omar	932d3f0198	NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555 ) + comments.	2018-01-18 10:06:58 +01:00
omar	d1f726cd9d	Comments about Begin/End pair and handling of return value.	2018-01-17 12:46:07 +01:00
omar	472ba1394c	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2018-01-15 20:13:42 +01:00
omar	28a76af185	Internal: DrawData: Tidying, renaming.	2018-01-15 20:12:48 +01:00
omar	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	398a4e1865	Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382 )	2018-01-11 13:58:25 +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	fe919995da	Merge branch 'master' into navigation	2018-01-08 16:35:12 +01:00
omar	ce95b84825	Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541 )	2018-01-08 15:30:39 +01:00
omar	168200f915	Popups: Comments, reorganize bits of the header section, renamed parameters.	2018-01-07 18:17:47 +01:00
omar	a8e5542d78	BeginPopup: Exposed extra_flags publicly. (#1533 )	2018-01-07 18:13:01 +01:00
omar	66b2ee6ea2	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2018-01-07 14:25:05 +01:00
omar	407955d9fb	Examples: Using IM_OFFSETOF macro. + Comments	2018-01-05 22:05:02 +01:00
omar	2b8224692e	Merge branch 'master' into navigation	2018-01-03 20:26:24 +01:00
omar	0a0b252bb6	DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert `06bea369c0`) as our use case doesn't need it anymore. Will add it if there is a real need.	2018-01-03 17:02:51 +01:00
omar	9fbecac87e	Demo: Improved Selectable() examples. (#1528 )	2018-01-03 15:11:14 +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	fbf2435f38	Exposed IM_OFFSETOF() helper in imgui.h	2017-12-29 18:16:19 +01:00
omar	eef9120e07	Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).	2017-12-29 18:14:36 +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	06bea369c0	DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.	2017-12-28 23:52:37 +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	d9034bf2d8	ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. (#931 )	2017-12-26 15:36:55 +01:00
Branimir Karadžić	149523a101	Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]	2017-12-25 22:27:32 +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	1b86e7343f	Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).	2017-12-24 18:16:22 +01:00
omar	b1930c5672	Merge branch 'master' into navigation	2017-12-23 20:37:53 +01:00
omar	e9ceef4762	ImVector: Revert `6172e93272` actually problematic with our current use (because we don't construct the instances).	2017-12-23 20:37:36 +01:00
omar	ffb4f6ca8c	Merge branch 'master' into navigation	2017-12-23 16:27:48 +01:00
omar	a5739a0aa3	Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type (#1184 )	2017-12-23 15:28:49 +01:00
omar	69879dd4f3	ImVector: Spacing.	2017-12-23 14:55:22 +01:00
omar	8e8b5498f7	ImVector: insert() uses grow_capacity() - had inconsistent resize policy	2017-12-23 14:51:28 +01:00
omar	6172e93272	ImVector: Added assignments and = operators + comments.	2017-12-23 14:49:23 +01:00
omar	1f26652944	Various zealous warning fixes (thanks Clang).	2017-12-23 14:07:03 +01:00
omar	287380261c	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2017-12-21 19:55:21 +01:00
omar	996dfb21cf	ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.	2017-12-21 19:49:54 +01:00
omar	14cb8177d0	ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.	2017-12-21 19:01:53 +01:00
omar	531c11d5c7	ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.	2017-12-21 18:52:34 +01:00
omar	230f826ef5	ImDrawList: Comments	2017-12-21 18:48:09 +01:00
omar	4c2514dc29	Merge branch 'master' into navigation	2017-12-21 11:18:42 +01:00
omar	55c0d2b9ab	InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (#1506 , #1508 )	2017-12-20 16:25:03 +01:00
ibachar	abaf347deb	Added a flag for text input to disable undo / redo	2017-12-17 15:27:56 +02:00
omar	6497f5dc1b	Merge branch 'master' into navigation # Conflicts: # imgui.h	2017-12-15 11:59:50 +01:00
omar	0c6e260f73	Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143 )	2017-12-15 11:17:21 +01:00
omar	51433e26af	Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143 )	2017-12-15 10:15:51 +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	45bca7851d	Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382 )	2017-12-13 22:30:16 +01:00
omar	5f39758202	Minor tweaks, comments, spacing fixes	2017-12-13 22:21:49 +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	16fb58984f	Merge branch 'master' into navigation	2017-12-12 23:41:48 +01:00
omar	90788a1242	ImVector: Added ImVector::contains() helper	2017-12-12 23:36:42 +01:00
omar	7c7a7baf76	Merged miscellaneous small stuff (from nav/dock branches).	2017-12-12 23:36:25 +01:00
omar	b174fcc9af	Added IsAnyWindowFocused() (from Nav branch).	2017-12-12 23:35:04 +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	e98df91dc4	Drag and Drop: Added ImGuiCol_DragDropTarget (#143 , #707 )	2017-12-12 15:44:22 +01:00
omar	7ec934f439	Drag and Drop: Comments	2017-12-12 15:33:26 +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	c22657985a	Added GetFrameHeight() function (used to be SmallSquareSize internally)	2017-12-12 14:12:49 +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	fa179d0ad8	Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags (#1382 )	2017-12-12 12:52:24 +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	185c1eaaf3	Alignment + removed comments	2017-12-11 22:55:28 +01:00
omar	f93945540f	Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. (#600 , #1330 )	2017-12-11 22:42:12 +01:00
omar	6b168b43ff	Comments (#822 )	2017-12-11 19:47:23 +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
omar	f06f68f3ce	Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)	2017-12-11 16:22:52 +01:00
omar	9fd15defe4	Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. (#787 )	2017-12-11 16:19:37 +01:00
omar	d1db229907	Merge branch 'master' into navigation # Conflicts: # imgui_demo.cpp	2017-12-10 19:01:59 +01:00
omar	1096e14356	ImFont: Added GetDebugName() helper.	2017-12-10 18:34:32 +01:00
omar	e3e0326ea9	Exposed BeginCombo() publicly.	2017-12-10 18:08:59 +01:00
omar	080f61858f	Sorted typedefs/enumations forward declarations in imgui.h	2017-12-10 17:57:27 +01:00
omar	eab6333a0b	SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) (#1490 )	2017-12-10 17:36:30 +01:00
omar	0872020c5c	Comments	2017-12-10 16:11:29 +01:00
omar	f72b002da8	Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). (#246 , #519 , #1444 )	2017-12-10 16:05:47 +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	7bf85db6c4	Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143 )	2017-12-08 12:48:53 +01:00
omar	553b0fcf8f	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2017-12-07 21:20:16 +01:00
omar	97edd42fc0	Indent(), Unindent(): Allow passing negative values.	2017-12-07 21:14:25 +01:00
omar	e6215b6ca0	Merge branch 'master' into navigation + merge fix # Conflicts: # imgui.cpp	2017-12-07 16:42:52 +01:00
omar	94bf12f14b	Demo: Display better mouse cursor info for debugging backends.	2017-12-07 13:27:49 +01:00
omar	20c7aab60c	Exposed GetOverlayDrawList(). (~#545, ~#530)	2017-12-07 12:49:52 +01:00
omar	3b7e4eaf38	Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822 )	2017-12-06 15:13:45 +01:00
omar	90ae1c59c4	Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822 )	2017-12-06 15:13:45 +01:00
omar	729333293c	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h	2017-12-05 22:56:35 +01:00
omar	0f119865a6	Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822 )	2017-12-05 22:53:58 +01:00
omar	2ca4f9e862	Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822 )	2017-12-05 22:42:57 +01:00
omar	63712d5f5c	Merge branch 'master' into drag_and_drop	2017-11-28 17:28:45 +01:00
omar	9191b17218	Merge branch 'master' into navigation	2017-11-28 17:28:08 +01:00
omar	4c4f1b0224	ImVector: Added ImVector::push_front helper.	2017-11-28 10:49:43 +01:00
Emmanuel Benoît	77a310736d	Horizontal mouse wheel support This patch adds support for the horizontal mouse wheel in ImGui. It affects windows that can be scrolled, as long as the Ctrl key is not being pressed. The scrolling speed has been set empirically so that it matches the scrolling speed on the Firefox browser when the horizontal wheel is used. Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in NewFrame to scroll the current window. The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified to use it.	2017-11-27 20:59:05 +01:00
omar	532f564fd3	ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().	2017-11-27 19:02:00 +01:00
omar	d9c5d72962	ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.	2017-11-24 16:56:17 +01:00
omar	2543807e56	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h	2017-11-20 13:54:06 +01:00
omar	3f5b2a3fe3	Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).	2017-11-20 13:53:16 +01:00
omar	31683cfe34	ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845 )	2017-11-20 13:31:40 +01:00
omar	ba095f81a5	Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image	2017-11-20 13:07:14 +01:00
omar	8c0f2e4946	Added comment to help people dealing with `58345b11e1` breakage (#707 )	2017-11-20 13:05:50 +01:00
thedmd	79f07f6ff0	Add AddImageRounded() to ImDrawList	2017-11-19 21:56:46 +01:00
omar	92212b17aa	Merge branch 'master' into drag_and_drop	2017-11-19 16:23:37 +01:00
omar	9848a7023b	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_demo.cpp	2017-11-19 16:21:21 +01:00
omar	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	c433bc971f	Reorder fields for consistency.	2017-11-19 14:58:10 +01:00
omar	39137ccc3e	Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707 )	2017-11-19 13:52:40 +01:00
omar	9886b09a0a	Minor tweak, removed extraneous empty destructor.	2017-11-19 12:42:17 +01:00
Jason Wilkins	e605f21797	TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)	2017-11-19 12:36:14 +01:00
omar	9a44d447cd	NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)	2017-11-19 12:06:45 +01:00
omar	d211a0e338	Merge branch 'master' into navigation (with style breakable) # Conflicts: # imgui.cpp # imgui_draw.cpp	2017-11-19 00:39:37 +01:00
omar	4022ada843	Merge branch 'master' into drag_and_drop	2017-11-19 00:36:32 +01:00
omar	4daf377c9b	Added comment about TextUnformatted(). (#1450 )	2017-11-19 00:32:47 +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	58345b11e1	Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707 )	2017-11-18 23:44:16 +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	7746dd104c	Merge branch 'master' into drag_and_drop	2017-11-16 13:28:22 +01:00
omar	6817f3a3d9	Merge branch 'master' into navigation	2017-11-15 23:44:50 +01:00
omar	f5bdf443c9	Minor comments, tweaks	2017-11-15 22:37:43 +01:00
omar	ae060b1d67	Merge branch 'master' into drag_and_drop	2017-11-15 10:24:54 +01:00
omar	ffad688fc8	Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. (#143 )	2017-11-14 22:11:43 +01:00
omar	2275cb8b83	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2017-11-13 15:19:43 +01:00
omar	30bf40195b	io.OptNoCursorBlink -> io.OptCursorBlink (#1427 )	2017-11-12 16:06:44 +01:00
omar	669498ff26	Added io.OptNoCursorBlink option to disable cursor blinking. (#1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. (#473 , #650 )	2017-11-12 16:03:09 +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	de1e7dc088	Drag and Drop: Moved internal fields out of public sight. (#143 )	2017-11-06 20:04:10 +01:00
omar	8b725c94cb	Drag and Drop: Rework internal to allow overlapping targets (#143 )	2017-11-06 19:39:23 +01:00
omar	3461a2f296	Merge branch 'master' into drag_and_drop	2017-11-02 18:06:04 +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
Giuseppe Barbieri	6fb43f2011	Update imgui.h	2017-11-01 17:56:03 +01:00
omar	66f42324ad	Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.	2017-11-01 17:25:42 +01:00
omar	63f6f2dd13	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h	2017-11-01 15:09:23 +01:00
omar	fba704bf5d	Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (#1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)	2017-11-01 14:24:09 +01:00
omar	59323b54da	Demo: Comments (#1408 )	2017-11-01 12:57:12 +01:00
omar	7f06d385a1	Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions	2017-10-30 09:50:54 +01:00
omar	0e775807b4	Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.	2017-10-29 23:10:44 +01:00
omar	acf78da742	Drag and drop: moved to imgui.h	2017-10-29 21:37:14 +01:00
omar	cb38caeda4	Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397 , #1366 , #1341 , #1222 , #1193 , #1115 , #951 , etc.)	2017-10-28 18:21:44 +02:00
omar	edafbcd630	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h	2017-10-27 20:04:51 +02:00
omar	c503a50cff	Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.	2017-10-27 20:01:30 +02:00
omar	77df1ba9e0	Version 1.53 WIP	2017-10-27 19:54:56 +02:00
omar	b422f35872	IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.	2017-10-27 18:21:30 +02:00
omar	c0b366b316	Merge branch 'master' into navigation # Conflicts: # imgui.h	2017-10-27 17:27:53 +02:00
omar	9f200d10d5	Version 1.52	2017-10-27 17:10:41 +02:00
omar	5afee1c6f3	Merge branch 'master' into navigation # Conflicts: # imgui_internal.h	2017-10-27 16:42:06 +02:00
omar	8dd7648db2	Comments	2017-10-27 16:41:22 +02:00
omar	3656f2c769	NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.	2017-10-27 16:39:23 +02:00
omar	f10a1d7b9e	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h	2017-10-27 15:53:59 +02:00
omar	a6ff14d66e	Exposed IM_ARRAYSIZE() in imgui.h	2017-10-26 16:12:53 +02:00
omar	f6ff373b22	Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui	2017-10-23 14:54:23 +02:00
omar	6f0aa766e1	Nav: Added internal ImGuiNavReadMode_Released test for key releases.	2017-10-23 11:26:30 +02:00
omar	d769e2515a	Merge branch 'master' into navigation	2017-10-23 10:05:36 +02:00
omar	7f880674e5	Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. (#1349 )	2017-10-22 10:24:56 +02:00
omar	5fa81f2a26	Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard. Remove the move/resize behavior that appears than holding the button for a while. (#787)	2017-10-20 22:12:10 +02:00
omar	e4bb9102f9	Merge branch 'master' into navigation	2017-10-20 20:32:17 +02:00
omar	43df7eb5ea	Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open. Made the color popups uses this standard function so they handle reopening a context menu.	2017-10-20 18:56:31 +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	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	d29a6a5a5a	Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.	2017-10-20 17:29:52 +02:00
omar	e384078d7a	IO: reordering some supposedly private fields.	2017-10-19 22:49:36 +02:00
omar	d96b6ecf88	Merge branch 'master' into navigation # Conflicts: # imgui_demo.cpp	2017-10-17 16:20:35 +02:00
omar	03b76bf05b	Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!	2017-10-17 16:19:21 +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	d761825cfb	Nav: Renaming a field + Comments.	2017-10-15 17:57:15 +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	4d83078885	Nav: Moving code next to its peers	2017-10-06 15:50:32 -07:00
omar	6e1199c603	Merge branch 'master' into navigation	2017-10-06 11:24:58 -07:00
omar	335c8dd159	Comments (clarifying whether types are to be considered as flags or regular, non combinable enums)	2017-10-06 11:23:08 -07:00
omar	59c6f35bf6	Added ActivateItem(), GetItemID() functions.	2017-10-05 21:34:01 -07:00
omar	a3d0755181	Merge branch 'master' into navigation	2017-10-05 10:31:37 -07:00
omar	a8788e51a7	SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)	2017-10-05 09:53:07 -07:00
omar	3ddcdcf6e7	Merge branch 'master' into navigation	2017-10-04 18:46:09 -07:00
omar	67ac7da30f	Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.	2017-10-04 18:13:57 -07:00
omar	ca4db8c905	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-28 17:40:25 +02:00
omar	f99348711b	Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.	2017-09-28 16:41:01 +02:00
omar	a2b2e56e8e	Merge branch 'master' into navigation	2017-09-27 12:31:12 +02:00
omar	09f6f564d9	ImFontAtlas: Fixed calling Clear() and rebuilding (broken in `3fe2ecfd4c`) thanks @pdoane @mikesart	2017-09-27 11:21:42 +02:00
omar	8fd4beddb8	Merge branch 'master' into navigation	2017-09-26 20:28:40 +02:00
omar	3fe2ecfd4c	ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs	2017-09-26 20:24:27 +02:00
omar	501e73feed	Minor comments	2017-09-26 20:18:14 +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	2170b0b278	ImFontAtlas: Comments and minor reorganization of declaration in header file.	2017-09-26 19:10:29 +02:00
omar	529ca279a4	ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)	2017-09-26 18:41:21 +02:00
omar	f1a20ec66d	Merge branch 'master' into navigation	2017-09-26 16:54:37 +02:00
omar	728deff56c	Comments, debug code (commented), todo list	2017-09-26 15:33:57 +02:00
omar	99b9f1c93c	Fix static misusage error with decent compilers. Error introduced in `4b82759598`	2017-09-26 11:23:06 +02:00
omar	7e8069dd23	Merge branch 'master' into navigation	2017-09-25 22:08:38 +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	92e55a8a79	Merge branch 'master' into navigation # Conflicts: # imgui.h	2017-09-18 16:06:48 +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	62d7fa4324	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-06 20:33:39 +02:00
omar	f63c03c464	Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.	2017-09-06 20:28:36 +02:00
omar	5c4fda0fbc	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h	2017-09-06 19:17:51 +02:00
omar	804ee78731	Added IsWindowAppearing().	2017-09-01 21:55:59 +02:00
omar	fd684ba974	Removed 2 obsolete redirection functions (obsoleted 26+ months ago).	2017-09-01 17:43:56 +02:00
omar	a9e1d9aab9	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2017-08-29 16:21:46 +08:00
omar	358e7a194e	Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.	2017-08-29 16:13:17 +08:00
omar	ee42fae468	Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787 )	2017-08-29 16:05:12 +08:00
omar	807322c9a5	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2017-08-26 18:43:10 +08:00
omar	5938f1ba61	Added IsMousePosValid() helper.	2017-08-26 15:18:06 +08:00
omar	f72ca6d22c	ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)	2017-08-26 14:11:56 +08:00
omar	304de0ee1b	ImFontConfig: Comments, const.	2017-08-26 14:11:41 +08:00
omar	92a6faca6f	IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.	2017-08-25 16:43:25 +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	6ed75d3046	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h	2017-08-22 20:27:39 +08:00
omar	eb2bbf6f29	Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit `6be7d4904e` merged from Nav.	2017-08-22 20:25:27 +08:00
omar	52b39af0a0	Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref `648f75b245`)	2017-08-22 20:23:46 +08:00
omar	6be7d4904e	Merge part of `88c1966629` from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.	2017-08-22 20:10:02 +08:00
omar	2e35957a81	Undo reordering of ImGuiKey in Nav branch	2017-08-22 20:02:52 +08:00
ocornut	50b3a14d0a	Merge `2545d75c3b` from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h	2017-08-22 18:26:27 +08:00
omar	53e73182ff	Merge branch 'master' into navigation # Conflicts: # imgui_internal.h	2017-08-21 00:04:45 +08:00
omar	9b484d24cd	ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.	2017-08-20 23:45:02 +08:00
omar	a511b00226	Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913 , #125 )	2017-08-20 19:32:50 +08:00
omar	19a42cb2fd	Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125 )	2017-08-20 18:44:48 +08:00
omar	bc78535bbf	Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master # Conflicts: # imgui.cpp # imgui.h	2017-08-20 18:22:34 +08:00
omar	b4eeb4aa8d	Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.	2017-08-20 17:53:09 +08:00
omar	af2db53780	Added GetStyleColorVec4()	2017-08-20 17:50:25 +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	d970957e2d	ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)	2017-08-17 19:36:48 +08:00
omar	24a78767d2	Merge branch 'master' into styles # Conflicts: # TODO.txt	2017-08-17 17:24:33 +08:00
omar	c569676a7b	ImVector: Added a const	2017-08-17 11:46:25 +08:00
Viktor Kirilov	fd9460a087	added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp	2017-08-16 17:52:11 +03: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	a85a14370b	OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.	2017-08-16 15:47:10 +08:00
omar	5ea1865fdb	(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.	2017-08-16 14:24:41 +08:00
omar	638d77c682	Comments (#402 )	2017-08-16 14:19:48 +08:00
omar	f98376d02b	Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open # Conflicts: # imgui.cpp	2017-08-16 13:19:15 +08:00
James Wallis	9239e91dc9	Whitespace fix to previous	2017-08-15 14:12:32 +01:00
James Wallis	718f00d651	Make font atlas packing padding configurable	2017-08-15 14:11:04 +01:00
omar	18f217e631	Style: Moved position of ImGuiCol_TitleBgCollapsed	2017-08-15 19:06:02 +08:00
omar	f8f382221c	ImVector: added resize() variant with initialization value	2017-08-15 11:41:00 +08:00
omar	9bf5028fd3	Merge branch 'master' into navigation	2017-08-15 00:50:59 +08:00
omar	d258287c92	Revert `d2c219d` #826 + tidying up ImFont::RenderChar()	2017-08-14 16:53:38 +08:00
omar	d2c219df84	Merge pull request #826 from swetland/patch ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query	2017-08-14 16:50:20 +08:00
omar	c26b29b254	Style: Moving code in a function to make incoming diff easier to parse.	2017-08-14 15:14:46 +08:00
omar	648f75b245	Style: renamed ImGuiCol_Columns_* to ImGuiCol_Separator_* (BREAKING), Separator() uses this color as well. (#707 , #1019 )	2017-08-14 13:04:32 +08:00
omar	8c61a4eb4c	Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)	2017-08-14 11:29:54 +08:00
omar	e3fae56089	Merge branch 'master' into navigation # Conflicts: # imgui.cpp	2017-08-11 14:30:17 +08:00
omar	d7cad903aa	Documentation tweaks	2017-08-11 14:29:27 +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	fed18d3203	Removed old ValueColor() helpers. (#346 )	2017-08-09 23:04:26 +08:00
omar	4fd148f4f9	Added ImFontAtlas::GlyphRangesBuilder helper + doc	2017-08-09 22:42:03 +08:00
omar	30d1e5712a	Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2017-08-08 17:30:32 +08:00
omar	942cb0e1f2	Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346 )	2017-08-08 15:54:20 +08:00
omar	03700ad15e	Merge remote-tracking branch 'origin' into 2016-07-navigation	2017-08-07 22:51:18 +08:00
omar	f4c0134f9f	Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment (#346 )	2017-08-06 18:08:58 +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	4b2f157fb1	Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346 )	2017-07-31 11:50:14 +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	65a27732d8	ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. (#346 )	2017-07-30 17:57:38 +08:00
omar	90fcd4a829	Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346 )	2017-07-30 17:55:42 +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	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	27e5b09af1	ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#346 )	2017-07-26 23:07:35 +08:00
omar	6796e771fd	ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346 ). Reorder flags again.	2017-07-26 16:28:01 +08:00
omar	c84acf3f56	Comments	2017-07-26 15:59:57 +08:00
omar	95fe11b5bf	Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions.	2017-07-26 14:34:59 +08:00
omar	f39cd61bf0	Reorder ImGuiColorEditFlags_ (#346 )	2017-07-23 19:08:58 +08:00
omar	4f1f251bd2	ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. (#346 )	2017-07-23 19:02:26 +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	790d0eb5be	ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346 )	2017-07-22 19:24:39 +08:00
omar	4355b2e422	ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments (#346 )	2017-07-22 19:04:10 +08:00
omar	15be7e1a71	ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h (#346 )	2017-07-22 18:01:16 +08:00
omar	dd9c2f97a8	ColorPicker: Renamed _NoSliders to _NoInputs (#346 )	2017-07-22 17:38:38 +08:00
omar	c8553817d9	Merge branch 'master' into 2016-02-colorpicker	2017-07-21 02:34:19 +08:00
omar	138a9dbaeb	Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862 )	2017-07-21 02:21:48 +08:00
omar	25f3717a1c	Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. (#1237 )	2017-07-20 20:57:46 +08:00
omar	3e4cb40d45	Merge branch 'master' into 2016-02-colorpicker	2017-07-19 14:53:25 +08:00
omar	d1145e990d	Comments tweak (#1231 )	2017-07-16 13:07:11 +08:00
omar	41f944238b	Comments about GlyphExtraSpacing (#1192 )	2017-07-15 18:03:43 +08:00
omar	8261d9ff30	Comments (#1172 , #1231 )	2017-07-15 17:11:53 +08:00
omar	03e6bfe84a	Comments	2017-07-14 19:49:11 +08:00
omar	d3f4309491	Comments about ImGuiStyleVar enum (#1198 )	2017-06-24 13:11:46 +02:00
omar	1e981f00e5	Comments	2017-06-21 13:50:31 +02:00
omar	a5e0210902	Revert `978c84d2e9` because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. (#1184 )	2017-06-19 21:19:48 +02: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	2acbd1ac2d	Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear	2017-06-02 11:25:45 +02:00
omar	62c4698a73	Further clarifications of the key indices passed to IsKeyXXX functions (#1159 )	2017-05-27 17:55:48 +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	9da53bcecd	ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)	2017-05-26 13:42:36 +02:00
omar	c5c77a3476	ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.	2017-05-26 13:36:52 +02:00
omar	27b83a2cac	Merge branch 'master' into 2016-07-navigation	2017-05-01 12:38:33 +02:00
omar	89b1497843	Merge branch 'master' into 2016-02-colorpicker	2017-05-01 12:37:34 +02:00
omar	a0a6c8a2ef	Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)	2017-05-01 12:36:46 +02:00
omar	6517d68cdf	ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK (#1009 )	2017-05-01 12:34:32 +02:00
Peter	659b3fd259	Add ImDrawList::AddImageQuad Adds a function AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col) that shows a texture on a full quad. This allows showing arbitrary rotations of a texture.	2017-04-28 10:04:20 +02:00
Mikulas Florek	7a37a1c3f6	do not export inline function, it causes problems on some compiers	2017-03-24 12:45:09 +01:00
Mikulas Florek	316555f9de	missing API	2017-03-24 10:10:22 +01: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	931bc61345	Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()	2017-03-16 21:55:36 +01:00
omar	2a3c61e5f8	Merge branch 'master' into 2016-07-navigation	2017-03-16 19:31:12 +01:00
omar	92ea8d1131	Merge branch 'master' into 2016-02-colorpicker	2017-03-16 19:28:30 +01:00
omar	6384eee34f	Minor comments (#998 )	2017-01-29 16:53:01 +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	cffdbfe01b	Comments (#972 )	2017-01-10 10:36:07 +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	db593220fc	Comments, clarified use of io.MouseDelta (#942 ) (ImGuiIO structure layout changed)	2016-12-23 11:34:23 +01:00
Nicolas Guillemot	36d78e0565	const correctness for Combo and ListBox Since Combo and ListBox only read and display the list of items, they should not modify the pointers inside the array of pointers passed in. Adding "const" here makes it possible to call these functions with such an array of const pointers. Previously, a cast to "const char**" was required as a workaround, otherwise there was a compile error.	2016-12-04 12:54:31 -08: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	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	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
Matt Keeter	32dbe836d0	Add user-facing IsPopupOpen function	2016-10-29 15:33:09 -04:00
ocornut	dd6163241c	Merge branch 'master' into 2016-02-colorpicker	2016-10-16 14:02:15 +02:00
ocornut	bdb34d1c11	Merge branch 'master' into 2016-07-navigation	2016-10-16 14:01:13 +02:00
ocornut	0d3f8807c7	Added a void* user_data parameter to Clipboard function handlers. (#875 )	2016-10-15 11:36:43 +02:00
ocornut	d649bc485b	Minor comments	2016-10-15 11:18:29 +02:00
ocornut	31dc7d8d63	Added ImGuiMouseCursor_None for usage by app/binding	2016-10-10 18:03:37 +02:00
ocornut	d567595dde	ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions	2016-10-09 10:35:01 +02: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
ocornut	e07d45709f	ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing (#844 )	2016-10-07 09:49:52 +02:00
ocornut	68c81739bf	Minor tidying up following merge BGRA color PR (#844 )	2016-10-01 14:29:12 +02: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
Michał Cichoń	d75d2b1871	Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h. When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.	2016-09-26 12:00:33 +02:00
ocornut	fea0fcb7c3	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 15:25:55 +02:00
ocornut	ed279c0095	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-09-25 12:59:24 +02:00
ocornut	1b5bbf725b	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-09-25 12:57:22 +02:00
ocornut	56cdbe434d	Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842 )	2016-09-25 12:53:13 +02:00
ocornut	0f303d363a	Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842 , #222 )	2016-09-25 12:19:15 +02:00
ocornut	c5b8c6303a	Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842 )	2016-09-25 11:06:14 +02:00
ocornut	612b17ef57	Fixing minor english typos (#827 )	2016-09-11 22:02:35 +02:00
Brian Swetland	5a47346f5a	ImFont: add RenderGlyph() to allow rendering of individual glyphs	2016-09-10 18:21:49 -07:00
ocornut	252f094101	Nav: Undo `87eb749cbc`, agressively including nav focus test in IsItemHovered() (#323 )	2016-08-21 15:26:40 +02:00
ocornut	87eb749cbc	Added IsItemHoveredOrFocused() (provisional name), better handling of popup/tooltip positioning when using mouse+nav (#323 )	2016-08-21 13:25:40 +02:00
ocornut	3ab0d5cdfd	Nav: NavHighlight gets its own color (default to Header color), made rectangle thicker (#323 )	2016-08-15 13:07:39 +02:00
ocornut	996eb080fa	Merge remote-tracking branch 'origin' into 2016-02-colorpicker	2016-08-11 22:53:26 +02:00
ocornut	df1d1b5b25	Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation (#323 , #180 )	2016-08-07 20:40:57 +02:00
ocornut	a68132948b	Nav: Added ImGuiCol_NavWindowingHighlight into style (#323 )	2016-08-07 15:26:04 +02:00
ocornut	5ef8452509	Nav: Comments (#323 )	2016-08-07 13:33:15 +02:00
ocornut	cbf24c13ca	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-08-07 12:15:21 +02:00
ocornut	5d1a0a6f77	Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015) OpenNextNode() -> SetNextTreeNodeOpen() GetWindowIsFocused() -> IsWindowFocused() GetItemBoxMin() -> GetItemRectMin() GetItemBoxMax() -> GetItemRectMax() IsMouseHoveringBox() -> IsMouseHoveringRect() IsClipped() -> !IsRectVisible()	2016-08-06 09:48:04 +02:00
ocornut	b8397c2933	Tweak comments (#768 )	2016-08-06 09:40:26 +02:00
Michał Cichoń	7588dfb67e	Add ability to test arbitrary rectangle for visibility without need of moving cursor.	2016-08-05 11:47:16 +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	4ccc87c91d	Typo in commented default-value	2016-08-03 21:53:07 +02:00
ocornut	2e52bee12e	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-07-31 17:00:44 +02:00
ocornut	907265d632	Using ImGuiID instead of ImU32 is a few places	2016-07-31 16:48:06 +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	2545d75c3b	Tidying up, removed two unnecessary window flags from being exposed in imgui.h	2016-07-31 13:05:13 +02:00
ocornut	b3cba62b80	Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows (#323 )	2016-07-31 12:55:23 +02:00
ocornut	68b73b61b5	Nav: Comment (#323 )	2016-07-30 23:17:32 +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	5f6f4d0ffc	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-07-29 11:17:13 +02:00
ocornut	666d83b5c7	InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors (#473 , #650 )	2016-07-29 10:56:47 +02:00
ocornut	802e91f69e	Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys	2016-07-29 10:34:01 +02:00
ocornut	c3aa36d9ab	Navigation: Renamed ImGuiKey_NavWindowing to ImGuiKey_NavMenu (#323 )	2016-07-24 14:49:16 +02:00
ocornut	b2ad33ce41	Merge remote-tracking branch 'origin' into 2016-07-navigation	2016-07-23 20:33:25 +02:00
ocornut	8efd05a148	Tab->Spaces, missing spaces, typos	2016-07-20 11:39:38 +02:00
Adisorn Aeksatean	4141144b21	Added GetGlyphRangesThai()	2016-07-20 11:37:08 +02:00
ocornut	c2cb2a6928	Gamepad/Keyboard navigation support, initial commit, WIP (#323 )	2016-07-20 00:02:59 +02:00
ocornut	4a11cc35b9	Updated code for repeat delay / repeat handling. GetKeyPressedAmount() now returns a count to support fast repeat rate (where DeltaTime > RepeatRate). Renamed from recently added IsKeyPressed() variant to GetKeyPressedAmount(). (no API breakage, added in branch, `bbd3b75609`) (#323)	2016-07-19 21:26:36 +02:00
ocornut	88c1966629	Added IsAnyWindowFocused(). Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsPosHoveringAnyWindow() -> IsAnyWindowHoveredAtPos(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.	2016-07-18 18:24:23 +02:00
ocornut	0300e73b3f	Comments	2016-07-18 15:26:07 +02:00
ocornut	bbd3b75609	Added IsKeyPressed() with explicit repeat delay and repeat rate (for usage by nav) (#323 )	2016-07-18 15:25:58 +02:00
ocornut	9c71ec38f0	ImVector: reserve() tweak to avoid undefined behavior warning (#731 )	2016-07-12 11:19:38 +02:00
Michael Bartnett	86f42b5950	osx uses super+arrows for home/end, built on work in ocornut/imgui#473	2016-07-07 13:02:52 -04: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	f83790dc5a	Comments	2016-06-12 12:23:20 +02:00
ocornut	2da30e8702	Comments (#691 )	2016-06-11 09:28:20 +02:00
ocornut	65a525550e	ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000)	2016-06-07 09:14:54 +02:00
ocornut	5d4cf1c3f3	Version 1.50 WIP	2016-05-30 19:38:36 +02:00
ocornut	adb85d800d	Version 1.49	2016-05-29 19:16:44 +02:00
ocornut	9a751da136	Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files	2016-05-29 19:14:19 +02:00
ocornut	3ddb50a925	Merge branch 'master' into 2016-02-colorpicker	2016-05-29 19:07:23 +02:00
ocornut	dcef7dedce	Comments (#590 )	2016-05-29 18:24:02 +02:00
ocornut	d5a12866fe	Comments (#676 , #655 )	2016-05-29 14:00:35 +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	61c294bb52	Added optional Indent() Unindent() width (#324 , #581 )	2016-05-28 18:40:00 +02:00
ocornut	a0a48f6e59	Added TreeAdvanceToLabelPos() (#581 )	2016-05-28 18:15:54 +02:00
ocornut	793f5f8cdb	Comments	2016-05-28 17:54:40 +02:00
ocornut	806a146198	TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324 , #581 )	2016-05-28 17:12:13 +02:00
ocornut	2acb61e3a1	Comments	2016-05-28 16:52:59 +02:00
ocornut	8f4b123e1b	SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668 )	2016-05-28 14:02:14 +02:00
ocornut	b7ebeb1610	Added SetNextWindowSizeConstraint() + demo code (#668 )	2016-05-21 22:53:08 +02:00
ocornut	753bf5cefe	Comments	2016-05-21 22:35:05 +02:00
ocornut	81bf5aeb09	Minor bits	2016-05-21 20:07:51 +02:00
ocornut	69a29e4715	Added NewLine() (very shy reminder that #97 isn't done)	2016-05-16 20:14:07 +02:00
ocornut	787be01e61	ImGuiListClipper comments (#660 , #661 , #662 )	2016-05-16 20:03:18 +02:00
ocornut	7a28f5bb81	ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662 )	2016-05-16 19:22:51 +02:00
ocornut	431eaf1abe	Comments to clarify what float[2] int[2] etc. are. May switch to pointers? (#659 )	2016-05-14 15:35:50 +02:00
ocornut	39bda5ea09	Fixed a IMGUI_API->inline case (#657 , #349 )	2016-05-14 10:22:25 +02:00
ocornut	f48f9a30ef	ButtonBehavior(), fixed subtle old bug when a repeating button would also return true on release + comments (#656 )	2016-05-13 11:13:54 +02:00
ocornut	b628acbb52	StyleEditor: comments (#652 )	2016-05-12 20:59:20 +02:00
ocornut	2f55dc1f33	ImFontConfig: Clarified persistence requirement of GlyphRanges array (#651 )	2016-05-12 11:58:05 +02:00
ocornut	aa11934efa	Comments to clarify default shared ImFontAtlas and current context pointer thread-safety (#586 , #591 )	2016-05-08 17:12:54 +02:00
ocornut	7b9c0a5c3f	Renamed ImGuiState -> ImGuiContext (#586 , #269 )	2016-05-07 19:55:51 +02:00
ocornut	8b428e8c74	Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586 , #269 )	2016-05-07 19:54:27 +02:00
ocornut	69cc00f91f	ImGuiStorage: Added bool helper functions for completeness.	2016-05-07 18:18:37 +02:00
ocornut	ce4d731486	Minor comments, tweaks	2016-05-07 18:10:32 +02:00
ocornut	89d5026187	Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625 , #579 )	2016-05-02 12:32:16 +02:00
ocornut	4170b4847d	Style: Changed default IndentSpacing from 22 to 21 (#581 , #324 )	2016-05-01 23:49:10 +02:00
ocornut	13df4668d1	Added GetTreeNodeToLabelSpacing() helper - tentative name (#581 , #324 )	2016-05-01 23:47:58 +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	4c880b7106	Added ImGuiTreeNodeFlags_OpenOnDoubleClick (#581 , #516 , #190 )	2016-05-01 17:46:08 +02:00
ocornut	a38fd2e186	Added TreeNodeEx() functions (#581 , #600 , #190 )	2016-05-01 17:45:31 +02:00
ocornut	ac501102fc	Added IsItemClicked() helper (#581 )	2016-05-01 17:43:17 +02:00
ocornut	ec6471ca87	TreeNodeEx() wired the display-side ImGuiTreeNodeFlags_Selected flag (#581 )	2016-05-01 16:06:46 +02:00
ocornut	ab6bc05fc3	Fixed ImGuiTreeNodeFlags_AllowOverlapMode to behave better on touch-style inputs (#600 )	2016-05-01 15:44:50 +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	befe02559a	Added IsRootWindowOrAnyChildHovered() helper (#615 )	2016-05-01 12:14:07 +02:00
ocornut	be7621f7c5	Updated FAQ about non UTF-8 literal (#609 , #613 )	2016-04-26 19:23:36 +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	4b6e9ac396	ImFont: Added AddRemapChar() helper (#609 )	2016-04-26 10:08:06 +02:00
ocornut	247da0e01b	BeginGroup() comment tweaks (#608 )	2016-04-25 08:45:32 +02:00
ocornut	4b51e43d60	BeginGroup() extra comment because this is overused and misleading (#608 )	2016-04-24 22:52:07 +02:00
ocornut	727ca4bd17	ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes	2016-04-23 11:37:18 +02:00
ocornut	a20d69f9ce	ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split	2016-04-23 11:29:42 +02:00
ocornut	44fb99542f	ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead.	2016-04-23 11:09:56 +02:00
ocornut	fe73a23cf5	ImFont: Added RenderChar() helper.	2016-04-22 19:58:10 +02:00
ocornut	d92f1deff8	ImDrawList: Added AddQuad(), AddQuadFilled() helpers.	2016-04-18 19:04:47 +02:00
ocornut	006934fd15	Todo items + not using function called isblank() because it may be a macro in some C library	2016-04-12 22:36:51 +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
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	07df3cfb3e	Added ImGuiWindowFlags_AlwaysUseWindowPadding flag to ensure non-border child window uses window padding (#462 )	2016-04-04 00:29:57 +02:00
ocornut	8e353af1d3	Renamed ImGuiWindowFlags_ForceScrollbar to ImGuiWindowFlags_AlwaysScrollbar (#476 )	2016-04-03 23:28:05 +02:00
ocornut	4c1d4233b2	Merge branch 'master' into 2016-02-colorpicker	2016-04-03 01:10:26 +02:00
ocornut	650515ce49	Updated todo list and comments	2016-04-03 01:07:11 +02:00
ocornut	d53c308852	Moved EndFrame() back to imgui_internal.h + comments. Undo `cfbf06e394`	2016-04-03 00:47:41 +02:00
ocornut	f48fc51777	IO: Added unused MultiSelectUsesSuperKey dummy field to convey semantic for OS X compatible behavior (#473 )	2016-04-02 18:58:42 +02:00
ocornut	aa7a29cdbf	InputText(): Added io.DoubleClickSelectsWord option for OS X compatible behavior (#473 )	2016-04-02 18:57:50 +02:00
ocornut	587fc60f25	InputText/IO: Added WordMovementUsesAltKey , ShortcutsUseSuperKey for OS X Compatible behavior (#473 )	2016-04-02 18:57:08 +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	cfbf06e394	Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)	2016-03-27 10:38:14 +02:00
ocornut	2b7eeba143	Trim trailing spaces	2016-03-26 15:38:52 +01:00
ocornut	04396ed7a9	FAQ and comments about the use of ImTextureID (#562 , #561 , #521 , #510 , #497 , #475 ...)	2016-03-24 11:00:47 +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	37d50dccf9	Added GetFontTexUvWhitePixel() helper.	2016-03-21 22:30:32 +01:00
ocornut	a274a09955	Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340 )	2016-03-21 22:29:11 +01:00
ocornut	928832a5bc	Various tidying up / comments, moved columns functions declarations, no functional changes	2016-03-21 22:11:43 +01:00
ocornut	9cbc6e196b	ImDrawList: AddRect() added optional thickness parameter + updated demo	2016-03-21 21:56:23 +01:00
ocornut	86fb3a6a3c	ImDrawList: AddCircle() takes optional thickness parameter	2016-03-21 21:48:05 +01:00
ocornut	a9e303e006	Minor comments	2016-03-21 12:56:56 -07:00
ocornut	4b7edffe8a	Comments	2016-03-08 20:54:21 +01:00
ocornut	6346690962	Comment (#544 )	2016-03-04 14:09:08 +01:00
ocornut	459af7683c	Merge branch 'master' into 2016-02-colorpicker	2016-03-04 13:57:33 +01:00
ocornut	3db40903ba	InputText() ImGuiInputTextFlags_CallbackAlways event set the EventFlag field of ImGuiTextEditCallbackData (#541 )	2016-03-04 13:07:42 +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	a43a9e602a	ColorEdit4: support ImGuiColorEditFlags_NoSliders to display only a button (wip #346 )	2016-02-21 23:55:01 +01:00
ocornut	f8fede1d8b	Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346 ) Still pretty much experimenting so may break API	2016-02-21 23:23:30 +01:00
ocornut	339b67c01a	Exposed FindWindowByName() in imgui_internal.h	2016-02-20 17:37:36 +01:00
ocornut	b329a36d27	Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517 )	2016-02-02 19:52:30 +01:00
Nikolay Zapolnov	a908c109c0	Added flag for selectables to handle double clicks.	2016-01-31 22:08:35 +01:00
ocornut	b6fe5eb4b4	Cleaned up the top of imgui.h, documenting all types / forward declarations	2016-01-23 12:45:56 +00:00
ocornut	d5fd87e806	Added IM_COL32 macros (ref #346 )	2016-01-23 12:15:49 +00:00
ocornut	85725ff9c6	Added ImGuiWindowFlags_ForceVerticalScrollbar, ImGuiWindowFlags_ForceHorizontalScrollbar flags (#476 )	2016-01-10 12:01:56 +00:00
ocornut	76ca7c42ca	ImDrawList: Added PrimQuadUV() helper to ease custom rendering of textured quads	2016-01-08 14:57:25 +00:00
ocornut	35085a4480	Drag, Slider clarified that keyboard inputs aren't clamped (#413 )	2016-01-02 12:21:30 +01:00
ocornut	8061a6ceea	ImVector: erase/insert uses Data/Data+Size directly.	2015-12-30 11:45:34 +01:00
ocornut	40ed6a51b0	Fixed ImGuITextBuffer::empty() - unused in core lib - from being utterly broken	2015-12-30 11:07:31 +01:00
ocornut	d212401624	Fixed ImDrawList::AddRect() which used to render a rectangle 1 px too large on each axis., fixed Image(), ImageButton() as well (#457 )	2015-12-27 21:31:43 +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	1c5aa32d2b	TODO items. Moved ImDrawList::Clear* methods suggesting they aren't for end-user.	2015-12-25 17:41:45 +01:00
ocornut	2849596069	Comments about ImDrawList::PushClipRect	2015-12-25 11:59:49 +01:00
ocornut	e4cf44e967	Minor rebranding "ImGui" -> "dear imgui" (#21 )	2015-12-24 20:00:50 +01:00
ocornut	96e2b925b1	Comments (#449 )	2015-12-24 10:45:52 +01:00
ocornut	4723d97cfb	Added BeginPopupContextItem() comment (#439 )	2015-12-21 00:04:33 +01:00
ocornut	5084f90a0d	Added ProgressBar() (#333 )	2015-12-13 21:41:45 +00:00
ocornut	76ab5587e4	GetColorU32: Comments	2015-12-13 19:55:15 +00:00
ocornut	9b6b1bc0f3	Added GetColorU32 helpers (previously internal and misplaced as window->Color())	2015-12-13 19:32:37 +00:00
ocornut	7bcebdc207	Comments and missing forward declaration	2015-12-13 18:02:15 +00:00
ocornut	8afbdd1ade	ImColor: Added SetHSV helper function.	2015-12-13 17:17:53 +00:00
ocornut	9583868bab	Added ImGuiIO::ClearInputCharacters() superfluous helper.	2015-12-12 00:08:54 +00:00
ocornut	c80e2274f1	Renamed Color() helpers to ValueColor() - dangerously named, rarely used and probably to be made obsolete.	2015-12-04 23:39:54 +00:00
ocornut	1aac69c937	Columns: tidying up, moving OffsetT to a ImGuiColumnData structure	2015-11-26 23:01:15 +00:00
ocornut	92c518a420	InputText: Added password mode via ImGuiInputTextFlags_Password (#237 , #363 , #374 )	2015-11-19 23:09:59 +01:00
ocornut	5549744e0f	Minor popups comment tweak (#402 )	2015-11-15 19:09:30 +01:00
ocornut	f87deff0f3	Moving stdlib.h include outside of imgui.h (#405 )	2015-11-13 17:08:54 +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	214e87d59c	InputText: comments.	2015-10-18 12:18:28 +01:00
ocornut	a5c895f791	Added SetClipboardText / GetClipboardText helper shortcuts to match MemAlloc / MemFree	2015-10-12 12:20:01 +02:00
ocornut	8c5c0c41fc	ImDrawList: AddImage() uv parameters default to (0.0) and (1.1)	2015-10-11 17:17:03 +02:00
ocornut	e83b529846	BeginChildFrame() helper has the extra_flags parameter.	2015-10-07 00:22:44 +02:00
ocornut	7508d30b83	ImGuiTextBuffer: added c_str() helper.	2015-10-04 11:22:47 +02:00
ocornut	e031fe484c	Added ImGuiWindowFlags_NoBringToFrontOnFocus behavior.	2015-10-02 19:07:04 +02:00
ocornut	572bf91006	Comments	2015-09-30 15:35:30 +02:00
ocornut	ecb63ff8f3	Inline functions not marked with IMGUI_API because apparently it is illegal for MinGW (fix #349 ) ARGH C++.	2015-09-27 22:28:16 +02:00
omar	9d89e03346	Merge pull request #348 from zho7611/add_korean_support ImFontAtlas: Added GetGlyphRangesKorean() for Korean.	2015-09-23 18:49:11 +02:00
Jiho Choi	cc53d31764	Add support for Korean.	2015-09-24 00:50:00 +09:00
ocornut	914516110c	Minor spacing	2015-09-22 00:53:11 +02:00
ocornut	ec7eb05e88	ImGuiTextFilter::Draw helper return bool and resplit when filter is modified	2015-09-14 13:03:20 +01:00
ocornut	0abe668221	ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice(#327 )	2015-09-11 16:50:00 +01:00
ocornut	1793c1a991	Comments	2015-09-09 14:15:17 +01:00
ocornut	b4f1e88860	Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() (#211 )	2015-09-09 09:08:08 +01:00
ocornut	f5fb5f0c1e	Minor tidying, reordering functions/members/initialisation to follow same orders	2015-09-07 23:39:36 +01:00
ocornut	dafad3903e	Added GetDrawData() alternative to setting a Render function.	2015-09-07 14:56:39 +01:00
ocornut	dbc7903da8	IsMouseHoveringRect() added 'bool clip' parameter to disable clipping the rectangle with the current parameters (#316 )	2015-09-03 13:13:13 +01:00
ocornut	09f659271e	ImFont: fixed comment (#317 )	2015-09-03 10:42:38 +01:00
ocornut	fc052e24b2	Added ImGuiWindowFlags_NoFocusOnAppearing flag (#314 )	2015-09-02 19:13:25 +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	f195bf744f	Tabs to spaces	2015-08-30 22:15:33 +01:00
ocornut	1eef2c9108	Comment	2015-08-30 18:35:02 +01:00
ocornut	71026d3655	Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246 )	2015-08-30 18:33:38 +01:00
ocornut	65a191c005	Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc (#246 ) GetCursorPos, SetCursorPos, GetContentRegionMax, GetWindowContentRegionMin, GetWindowContentRegionMax are now including the scrolling amount. It PROBABLY shouldn't break anything for you, but take note that SetCursorPosX(100.0f) puts you at +100 from the starting x position which may include scrolling, not at +100 from the window left side.	2015-08-30 16:37:56 +01:00
ocornut	d88b73a8b7	Added GetContentRegionAvailWidth() helper. Demo tweaks.	2015-08-30 15:35:59 +01:00
ocornut	0aa353868f	Minor internal shortcuts not calling GetCurrentWindow()	2015-08-30 10:49:47 +01:00
ocornut	2d565d4bfb	Style: rename ScrollbarWidth to ScrollbarSize (sorry!)	2015-08-29 23:47:47 +01:00
ocornut	65fe60f2b2	Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) (#282 )	2015-08-29 18:13:30 +01:00
ocornut	0a11024459	IO.WantInputCharacters -> WantTextInput (#305 )	2015-08-28 15:34:53 +01:00
ocornut	30461345aa	Removed default name parameter in Begin() We already have a "Debug" window pushed to the stack in the first place so it's not really a useful default.	2015-08-28 15:24:04 +01:00
ocornut	90e5c97f13	AddBezier()->AddBezierCurve(). PathBezierTo()->PathBezierCurveTo(), and reads current point back, more standard (#311 )	2015-08-28 13:48:14 +01:00
ocornut	80ad773c87	ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves (#311 )	2015-08-28 13:18:34 +01:00
ocornut	e58f99179a	Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287 )	2015-08-27 19:51:02 +01:00
ocornut	a36001212f	ImDrawData: added ScaleClipRects() helper (#287 )	2015-08-27 18:45:43 +01:00
ocornut	59d498f3d0	Added ColorConvertU32ToFloat4() helper and ImColor(ImU32) constructor.	2015-08-26 21:18:08 +01:00
ocornut	8cf7df7ec4	Added GetWindowHeight() for completeness + BeginGroup() comment.	2015-08-25 16:55:14 +01:00
ocornut	08b345efd9	ImDrawList: Add comments on the usage of drawing channels	2015-08-25 16:31:20 +01:00
ocornut	77b82ecad7	ImDrawList: Fixed issues with channels split/merge. Functional without manually adding a draw cmd. + Removed unnecessary parameter to Channe	2015-08-25 16:24:17 +01:00
ocornut	ad3c9f620d	Tabs to spaces	2015-08-25 12:40:40 +01:00
ocornut	063d26a191	Removed obsolete comment	2015-08-24 18:13:31 +01:00
ocornut	b1987d697f	Trim trailing whitespace (#305 )	2015-08-24 13:50:18 +02:00
ocornut	425c6cb3a3	Remove CaptureInputCharactersFromApp and minor cleanups (#305 )	2015-08-24 13:47:27 +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	97be3428f1	Added GetMousePosOnOpeningCurrentPopup().	2015-08-15 15:10:07 -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	307ed78006	ImGuITextBuffer: shallow tweak.	2015-08-13 21:48:08 -06:00
ocornut	42567a9516	ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.	2015-08-13 21:25:32 -06:00
ocornut	c98318a914	Renaming some argument to clarify the local vs screen coordinates	2015-08-12 22:46:39 -06:00
ocornut	f421f2f47e	IsWindowHovered() takes account of window hoverability (may be disabled because of a popup) + comment Was a dupe of IsMouseHoveringWindow() anyway, they are now "clearly" different.	2015-08-12 22:30:07 -06:00
ocornut	0c9fcdbe71	Allow to override ImDrawIdx type (#292 )	2015-08-09 11:11:39 -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	a793ad682d	Merge branch 'master' into 2015-07-cleanup Conflicts: imgui.cpp	2015-08-05 15:29:38 -06:00
ocornut	7fea3eacfe	Minor comments	2015-08-05 12:50:13 -06:00
ocornut	155873a6b0	Added GetContentRegionAvail() helper	2015-08-05 10:43:12 -06:00
ocornut	815d1d9be4	Merge remote-tracking branch 'origin' into 2015-07-cleanup Conflicts: imgui.cpp	2015-08-03 08:12:57 -06:00
ocornut	3aca446817	Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()	2015-08-03 08:10:10 -06:00
ocornut	e099798c97	Merge remote-tracking branch 'origin' into 2015-07-cleanup	2015-08-01 22:12:51 -06:00
ocornut	1e76c63bb6	Fixed comment	2015-08-01 08:07:16 -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
ocornut	5a4b521855	Added ImDrawList::AddText() shorthand helper	2015-07-18 21:50:23 -06:00
ocornut	74908a9513	Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason	2015-07-18 18:45:37 -06:00
ocornut	82727d7119	Version number 1.44 WIP	2015-07-18 14:07:22 -06:00
ocornut	cdbf71ac12	Added ImGuiWindowFlags_NoInputs for input-passthru window Would be more useful with finer control over display layer	2015-07-17 16:36:04 -06:00
ocornut	20db726a9a	Version number 1.44 WIP	2015-07-17 16:03:13 -06:00
ocornut	e8cb874afe	Version number 1.43	2015-07-17 06:51:25 -06:00
ocornut	d6117e33d0	AddInputCharactersUTF8: shallow tweaks (#274 )	2015-07-15 22:14:04 -06:00
Daniel Gibson	be8fb858cc	Add ImGuiIO::AddInputCharactersUTF8(char* utf8str) It'll convert the utf8 string to ImWchar's and passes each of them to AddInputCharacter(). Very handy for SDL2 SDL_TEXTINPUT events, which provide a buffer with an UTF-8 string.	2015-07-16 05:15:03 +02:00
ocornut	5e846612d3	ImFont: tweaks	2015-07-15 14:54:56 -06:00
ocornut	3e3d9f9a69	ImFontAtlas: allow AddFontDefault to take a config	2015-07-15 07:58:33 -06:00
ocornut	815168c7ef	ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182 , #220 , #232 , #242 )	2015-07-15 07:01:21 -06:00
ocornut	6ae8062ca0	ImFont: comments, minor bits	2015-07-14 15:51:19 -06:00
ocornut	c02f9b58ef	ImFont: Cleanup to be compatible with over-sampling (not enabled)	2015-07-14 12:41:02 -06:00
ocornut	ba9317b924	ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype	2015-07-13 16:08:49 -06:00
ocornut	fbb9113118	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-07-12 11:02:46 -06:00
ocornut	6520b6c458	ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.	2015-07-12 10:48:06 -06:00
ocornut	fd44b9440b	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-07-10 21:45:25 -06:00
ocornut	b67593a4b1	Changed SameLine() parameters from int to float.	2015-07-10 19:36:34 -06:00
ocornut	827ff970cd	InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag	2015-07-10 18:47:55 -06:00
ocornut	d2701727b9	InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.	2015-07-10 18:17:46 -06:00
ocornut	245cf36522	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-07-08 17:09:47 -06:00
ocornut	890585cde8	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-07-08 17:08:51 -06:00
ocornut	08b1dd1035	Version number 1.43 WIP Bits	2015-07-08 17:08:37 -06:00
ocornut	09e8c4ec11	AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133 )	2015-07-08 14:03:27 -06:00
ocornut	e5bea65582	Version number 1.42	2015-07-08 12:59:26 -06:00
ocornut	54c2665032	AA branch: undo `d35c1a9e66`, thickness is back but goes through non-AA path (#133 )	2015-07-07 20:56:58 -06:00
ocornut	d03b046ef4	AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133 )	2015-07-07 20:17:07 -06:00
ocornut	d35c1a9e66	AA branch: removed the 'thickness' parameter from ImDrawList::AddLine()	2015-07-07 18:34:29 -06:00
ocornut	87ebe95fd6	Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls (#125 )	2015-07-07 18:19:01 -06:00
ocornut	3e4841765d	ImDrawList: winodw draw lists destructed properly on Shutdown()	2015-07-07 18:00:19 -06:00
ocornut	bfa7d86070	AA branch: further use of ImVector<> Data/Size	2015-07-07 12:58:36 -06:00
ocornut	c3ced1bd71	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-07-07 12:42:29 -06:00
ocornut	3869e10574	ImVector<> access to Size/Capacity/Data (#262 )	2015-07-07 12:39:08 -06:00
ocornut	25882c47a3	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: examples/directx11_example/imgui_impl_dx11.cpp examples/directx9_example/imgui_impl_dx9.cpp examples/opengl3_example/imgui_impl_glfw_gl3.cpp examples/opengl_example/imgui_impl_glfw.cpp imgui.cpp	2015-07-07 12:15:35 -06:00
ocornut	502e360ee5	Removed the majority of size_t from the code. ImVector<> now uses int. (#262 ) May trigger new compilation warnings?	2015-07-07 12:09:25 -06:00
ocornut	02dbcf5405	ImVector<> cannot be re-defined (#262 )	2015-07-07 11:27:22 -06:00
ocornut	6a22835f63	AA branch: ImDrawList: rename commands to cmd_buffer Not strictly necessary but while we're doing minor breakage let's do them at all once.	2015-07-06 21:09:05 -06:00
ocornut	0ff2a6ff64	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-07-06 10:56:50 -06:00
ocornut	d6987d1586	ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.	2015-07-06 10:52:49 -06:00
ocornut	c52cefa2c2	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-07-05 22:27:50 -06:00
ocornut	0676efd37f	AA branch: added ImDrawData::DeIndexAllBuffers() helper (#254 )	2015-07-05 22:09:55 -06:00
ocornut	b2b616be00	AA branch: ImDrawCmd idx_count -> elem_count	2015-07-05 22:09:15 -06:00
ocornut	f3303fa84f	AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254 )	2015-07-05 22:03:46 -06:00
ocornut	2633325b9f	Comments	2015-07-05 21:55:24 -06:00
ocornut	562aecdaa5	Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)	2015-07-05 20:56:01 -06:00
ocornut	56553f33b8	AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes (#133 )	2015-07-05 19:09:53 -06:00
ocornut	f435e42561	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: examples/opengl_example/imgui_impl_glfw.cpp	2015-07-04 12:44:25 -06:00
ocornut	d76bc3434e	Added DragFloatRange2() DragIntRange2() helpers (#76 )	2015-07-04 12:17:11 -06:00
ocornut	e9b81dd5ab	Comments	2015-07-03 15:32:10 -06:00
ocornut	fd3c6067bf	Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems (#255 )	2015-07-03 15:31:54 -06:00
ocornut	b69d7d9df3	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-07-02 21:47:48 -06:00
ocornut	2f03511062	Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.	2015-07-02 21:43:07 -06:00
ocornut	6826ab3ffd	Added GetKeyIndex() helper.	2015-07-02 21:32:29 -06:00
ocornut	42efc29def	SetScrollFromCursorPos() -> SetScrollHere() (#150 ) final call !	2015-07-02 21:03:15 -06:00
ocornut	4eba6cd470	Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). (#150 )	2015-07-02 20:53:45 -06:00
ocornut	b37a326163	Renamed GetScrollPosY() to GetScrollY(). (#150 ) Necessary to reduce confusion along with other scrolling functions, because positions (e.g. cursor position) are not equivalent to scrolling amount.	2015-07-02 20:47:04 -06:00
ocornut	531d0ce7ce	Moving tooltips and popup chunks of imgui.h below widgets (#219 )	2015-07-02 14:55:30 -06:00
ocornut	0201fe6ed1	Comments	2015-07-02 14:49:38 -06:00
ocornut	9bedcb5304	Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content (#150 )	2015-07-02 14:46:49 -06:00
ocornut	bbc22ac8ca	Comments + remove trailing comma	2015-07-02 11:26:35 -06:00
ocornut	90ec28f6de	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-07-02 10:23:21 -06:00
ocornut	e0da1e0658	Split into CaptureKeyboardFromApp() / CaptureMouseFromApp()	2015-07-02 09:20:15 -06:00
ocornut	77fad80e9f	Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing	2015-07-02 09:10:31 -06:00
ocornut	eaaab0120a	Moved Inputs utilities to their own section in imgui.h + additional comments	2015-07-02 08:57:17 -06:00
ocornut	b74d8e4c87	SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150 )	2015-07-01 17:51:44 -06:00
ocornut	067b7d909a	Style: Added GrabRounding (works well with AA branch). Followup to #212	2015-06-30 15:02:59 -06:00
ocornut	d3c0bfefb3	AA branch: render axis aligned rect bypassing the AA path	2015-06-30 14:51:25 -06:00
ocornut	47826830af	Adding TitleBgActive color - still issues with popups/menus (#253 )	2015-06-30 13:40:13 -06:00
ocornut	1318e1b74c	AA branch: remove unused functions.	2015-06-30 13:30:25 -06:00
ocornut	4bb94a9e4d	AA branch: more optimisations.	2015-06-30 13:27:35 -06:00
ocornut	c3040dee35	AA branch: more inline.	2015-06-30 12:55:14 -06:00
ocornut	077285ae57	AA branch: tidying up, inline PathStroke PathFill	2015-06-30 12:51:52 -06:00
ocornut	aaefe458df	AA branch: cleanup	2015-06-30 12:44:03 -06:00
ocornut	ebfe4637d4	Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives Conflicts: imgui.cpp imgui.h	2015-06-30 12:43:26 -06:00
ocornut	d57ee2458c	AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion	2015-06-29 19:25:41 -06:00
ocornut	43dcd6ef47	Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering Conflicts: imgui.cpp	2015-06-29 15:43:58 -06:00
ocornut	0bf90770b0	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-06-29 15:40:38 -06:00
ocornut	4ac21aaa12	Version number 1.42 wip + todo list entries	2015-06-26 20:48:53 -06:00
ocornut	ea2c824192	Version 1.41	2015-06-25 21:38:24 -06:00
ocornut	5436266963	Added SetNextWindowPosCenter() (#249 )	2015-06-23 15:34:44 -06:00
ocornut	2a041cfbe1	Added GetGlyphRangesCyrillic() helper (#237 )	2015-06-23 14:13:22 -06:00
ocornut	fe17f6e735	Added modal window darkening of previous windows (#249 )	2015-06-23 12:34:15 -06:00
ocornut	8c790a3234	BeginPopupModal() can have an optional close-window button (#249 )	2015-06-23 11:08:19 -06:00
ocornut	bce495c581	Added BeginPopupModal() with actual modal behaviour (WIP api) (#249 )	2015-06-23 10:02:56 -06:00
ocornut	f10bbbb851	Minor comment fix (#248 )	2015-06-22 07:57:45 -06:00
ocornut	0b98d3eb26	Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering Conflicts: imgui.cpp	2015-06-21 20:01:25 -06:00
ocornut	01cb0dc7f7	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp imgui.h	2015-06-21 19:58:30 -06:00
ocornut	0884cb51cd	Added IsKeyReleased() (#248 ), added keyboard & mouse state panel in the demo window	2015-06-21 19:04:43 -06:00
ocornut	68534c2319	Added IsMouseReleased() helper (#248 )	2015-06-21 18:15:31 -06:00
ocornut	d0ea5942a9	InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200 )	2015-06-18 08:49:57 -06:00
ocornut	0795a60c6b	InputText() fixed multi-line selection clipping. (#200 )	2015-06-16 20:35:46 -06:00
ocornut	748837acfd	Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit Conflicts: imgui.h	2015-06-16 17:23:28 -06:00
ocornut	a248575dea	Text rendering can be finely clipped cpu-side on top and left axises (for #200 )	2015-06-16 17:21:07 -06:00
ocornut	0df7b472c2	InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling	2015-06-16 15:46:45 -06:00
ocornut	b360c83e92	Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering	2015-06-14 20:29:10 -06:00
ocornut	7d860a0181	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives Conflicts: imgui.cpp	2015-06-14 20:28:19 -06:00
ocornut	6eb1fec7a9	ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent.	2015-06-14 17:30:06 -06:00
ocornut	b503e5ee5b	ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding (#243 )	2015-06-14 16:18:22 -06:00
ocornut	4f0fa58ff2	Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125	2015-06-14 15:19:47 -06:00
ocornut	c82e72eecb	Selectable() parameter comment	2015-06-14 15:14:33 -06:00
ocornut	cf481e1a7b	Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns (#125 )	2015-06-14 12:41:40 -06:00
ocornut	0e04dfbad7	Added IsWindowHovered() helper.	2015-06-02 20:57:29 +01:00
ocornut	9928d19af1	Version 1.41 WIP	2015-06-02 14:41:14 +01:00
ocornut	c603534d38	Version 1.40	2015-05-31 19:24:32 +01:00
ocornut	a76eea85c8	Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering Conflicts: imgui.cpp	2015-05-31 16:59:01 +01:00
ocornut	ade7661b3f	Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives	2015-05-31 16:57:43 +01:00
ocornut	1c2dac2a90	Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge)	2015-05-31 14:46:28 +01:00
ocornut	374d160234	BeginPopupContextWindow() in_empty_space_only -> !also_over_items (#126 )+ comments Sorry if you used this parameter already.	2015-05-31 12:55:12 +01:00
ocornut	eb4ffd5dbd	Added ImGuiListClipper helper to avoid using CalcListClipping() directly.	2015-05-31 12:33:24 +01:00
ocornut	df37df821e	RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection.	2015-05-31 11:52:57 +01:00
ocornut	0539be7067	Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS	2015-05-31 11:17:58 +01:00

... 13 14 15 16 17 ...

1835 Commits