mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,020 Commits 10 Branches 119 Tags 239 MiB
Commit Graph

1360 Commits

Author SHA1 Message Date
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_Force**Scrollbar to ImGuiWindowFlags_Always**Scrollbar (#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
ocornut 475498f2eb Comments, moved Sliders below Drag & Input in imgui.h 2015-05-31 11:12:29 +01:00
ocornut 03ff2faacb Comments 2015-05-31 11:01:22 +01:00
ocornut c4cb768432 Comments 2015-05-31 10:53:42 +01:00
ocornut 9417df2a26 Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete) 2015-05-31 09:12:07 +01:00
ocornut f0781d3a24 Added GetItemsLineHeightWithSpacing() helper. 2015-05-29 09:00:34 +01:00
ocornut dcc7df2b21 Added BeginPopupContextVoid() helper for completeness (#126) 2015-05-27 23:28:53 +01:00
ocornut 1cb6a294b0 BeginPopupContextWindow() rearranged and clarified parameters (#126) 2015-05-27 23:07:24 +01:00
ocornut 938528e5ee Added BeginPopupContextItem() / BeginPopupContextWindow() (#126) 2015-05-27 22:36:23 +01:00
ocornut 8c4c421f74 Added IsAnyItemHovered() public helper. 2015-05-27 22:02:12 +01:00
ocornut 3d36c81241 Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() ! 2015-05-27 15:22:09 +01:00
ocornut d69f2f57ee Added configurable io.KeyRepeatDelay, io.KeyRepeatRate 2015-05-27 15:17:44 +01:00
ocornut f841097e99 Button centering left to RenderTextClipped function. 2015-05-27 14:20:50 +01:00
ocornut b8ee48a74b OpenPopup() Comments 2015-05-27 09:18:04 +01:00
ocornut 6f32684f15 Examples: various usage comments. 2015-05-26 21:36:44 +01:00
ocornut 15113f682e Added TextDisabled(), TextDisabledV() helpers. 2015-05-26 21:10:16 +01:00
ocornut 3a6e6645e6 WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. (#126) 2015-05-26 20:33:48 +01:00
ocornut 6b3ccd3edf WIP Menus: Added support for disabled sub-menu (#126) 2015-05-26 18:02:42 +01:00
ocornut 0db122bc3b Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases (#126) 2015-05-26 17:48:28 +01:00
ocornut fd0108dbef Comments 2015-05-25 23:37:08 +01:00
ocornut 3498617a3c Comments. 2015-05-24 22:16:34 +01:00
ocornut 14bcfef041 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-24 17:32:10 +01:00
ocornut 8cfae35042 Added Dummy() helper 2015-05-24 17:30:59 +01:00
ocornut 89d1340225 WIP Menus: Added Enabled/Disabled option for MenuItem() (#126) 2015-05-23 13:54:57 +01:00
ocornut 485832fe06 WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples. 2015-05-23 13:43:45 +01:00
ocornut e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
 2015-05-21 22:57:29 +01:00
ocornut cc3ed515ca Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-21 22:52:46 +01:00
ocornut 92ded00fd9 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-18 23:32:32 +01:00
ocornut da53caf310 Moved ImVector<> after the main block (#219) 2015-05-18 22:33:43 +01:00
ocornut 6da8a77fa3 WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126) 2015-05-18 19:41:02 +01:00
ocornut e674df8101 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-18 16:45:55 +01:00
ocornut 0e8c2f9d41 Comments 2015-05-18 14:10:59 +01:00
ocornut 4bd43bdb35 Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu 2015-05-17 22:28:57 +01:00
ocornut f2b738648f WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126). 2015-05-17 17:13:45 +01:00
ocornut e0594340ff Moved internal window flags to higher bit-count 2015-05-17 16:29:00 +01:00
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
	imgui.h
 2015-05-15 17:33:04 +01:00
ocornut 1eafe86627 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-15 17:31:56 +01:00
ocornut fa0f0f4507 ImVector: tweak growth strategy 2015-05-15 13:14:46 +01:00
ocornut d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations 2015-05-15 12:05:05 +01:00
ocornut 1e4c22c206 Added io.MetricsActiveWindows counter (#213) 2015-05-12 16:08:34 +01:00
ocornut 9d9cf31972 ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224) 2015-05-12 14:53:29 +01:00
ocornut 30552ecfd6 Fixed comment (fix #223) 2015-05-12 11:51:22 +01:00
ocornut 356a37edcf Added window title text horizontal alignment option (#222),, ImGuiAlign_ type for future use. 2015-05-12 11:49:24 +01:00
ocornut 03720acaff Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-12 10:11:14 +01:00
ocornut 9be3319653 Tweaks, comments around ImFontAtlas 
Removed unsigned int from API
 2015-05-12 09:08:47 +01:00
ocornut 9e307d60e3 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-11 21:45:13 +01:00
ocornut 515e0c6122 Cleanup, merged duplicate code into a function 2015-05-11 21:44:50 +01:00
ocornut 5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-11 20:39:19 +01:00
ocornut 7fb704d308 WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) (#126) 
May remove the ImGuiWindowFlags_Menu alltogether
 2015-05-11 19:52:02 +01:00
ocornut 34aad73fd8 Added ImGuiCol_TextDisabled 2015-05-11 19:36:32 +01:00
omar 33a2fd368a Merge pull request #218 from paperManu/inputNFlags 
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
 2015-05-11 16:54:12 +01:00
Emmanuel Durand b3faed610d Renamed flags to extra_flags in last commit 2015-05-11 11:40:08 -04:00
ocornut fcd08ed8d4 BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126) 2015-05-11 15:57:02 +01:00
Emmanuel Durand 94b7c9e307 Input text flags added to InputFloatN and InputIntN 2015-05-11 10:15:22 -04:00
ocornut c2c43928a9 Untabifiy 2015-05-11 09:26:53 +01:00
ocornut 4913668ea4 Fixed implicit conversion of NULL constant to bool (fix #216) 2015-05-11 09:23:29 +01:00
ocornut f293bec97c Added style.ScrollbarRounding #212 2015-05-09 10:13:56 +01:00
ocornut dd2a578012 Added ImGuiSetCond_Appearing to test the hidden->visible transition. 2015-05-07 18:39:23 +01:00
ocornut f46557d2d6 MenuItem() draft for popups, with Selected option (wip #126) 2015-05-07 17:21:48 +01:00
ocornut 85b8967291 Added RenderCheckMark() helper following the font size 
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
 2015-05-07 17:06:07 +01:00
ocornut e7ffcea33d Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same). 2015-05-03 14:26:47 +01:00
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-05-02 22:20:48 +01:00
ocornut 08fd6a7e7d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-02 22:20:14 +01:00
ocornut 221f36e116 Comments, tweaks, metrics window tweak 2015-05-02 17:54:25 +01:00
ocornut 07ebb14ce2 Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus. 2015-05-01 20:35:44 +01:00
ocornut 68ccdc4fb8 Comments 2015-05-01 11:07:30 +02:00
ocornut 8fbb42cc6f Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures 
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
 2015-04-28 18:12:24 +02:00
ocornut c93a562b06 Added ImGuiStorage::GetVoidPtrRef() 2015-04-21 10:12:17 +01:00
ocornut 9119f58ce5 Version number 1.39 WIP 2015-04-21 10:09:20 +01:00
ocornut 0123fc8c0f Removed comment 2015-04-19 23:56:35 +01:00
ocornut 064b94721e Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4. 2015-04-19 23:28:57 +01:00
ocornut 94c4e9564d Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-04-19 23:00:14 +01:00
ocornut 86d1abf3f6 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-19 22:59:53 +01:00
ocornut 05ee36baab Version number 1.38 2015-04-19 22:59:27 +01:00
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
 2015-04-14 09:51:28 +01:00
ocornut 0bb89ccee2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-14 09:49:04 +01:00
Stephan Dilly b28ec1f3b1 fix outdated documentation 2015-04-14 00:40:46 +02:00
ocornut dd36e8bf2b Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete). 2015-04-13 22:04:28 +01:00
ocornut d11b4160aa Added IsItemVisible(). Made IsClipped() also return false when log is enabled. 2015-04-13 21:52:38 +01:00
ocornut 9918ec31d6 Added ResetMouseDragDelta() for iterative dragging operations 2015-04-13 19:54:40 +01:00
ocornut a143e2e772 Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies 2015-04-13 14:45:27 +01:00
ocornut 6ed06a8dc8 DragFloat() added power parameter for logarithmic drag on both side of zero #180 2015-04-13 00:03:57 +01:00
ocornut f5ad362912 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180 2015-04-12 19:15:55 +01:00
ocornut 0dc3d07e7f DragInt() step given as float to allow finer control of speed #180 2015-04-12 19:08:56 +01:00
ocornut 62abde5b37 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180 2015-04-12 19:07:48 +01:00
ocornut ac740170b9 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 18:00:09 +01:00
ocornut bff9a6b6e3 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 17:52:51 +01:00
ocornut e0cd947904 AA branch: Fixes. 2015-04-09 22:40:50 +01:00
ocornut 1e69175403 AA branch: Test disabling aa at runtime for stroke and fill. 2015-04-09 22:31:26 +01:00
ocornut 14ddb81f7a AA branch: remove code unnecessary for this branch. 2015-04-09 21:39:56 +01:00
ocornut 39445cf23a Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-04-09 21:38:30 +01:00
ocornut 1746b04065 Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat 2015-04-09 21:05:35 +01:00
ocornut 500a8a0e02 ImDrawList: bits of renaming. 2015-04-09 21:00:45 +01:00
ocornut 4fa3eee84e Renamed io.MetricsVertices to io.MetricsRenderVertices 2015-04-09 19:47:41 +01:00
ocornut 334fba2f56 Spacing 2015-04-09 17:33:17 +01:00
ocornut 707df6c7b7 ImDrawList: internal refactoring toward a following commit for indexed rendering. 2015-04-09 17:32:03 +01:00
ocornut aa2935968e Renamed AddArcFast() parameter 'tris' to 'filled' 2015-04-09 16:47:20 +01:00
ocornut 0fc1f5b17f Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc 2015-04-09 16:45:14 +01:00
ocornut 200d3482dc Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16 2015-04-09 00:49:21 +01:00
Stephan Dilly 5ba77928ba fix initialising ints with float literals 2015-04-08 22:56:25 +02:00
ocornut 323ae8326e Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-07 13:51:01 +01:00
ocornut d692286862 Added ShowMetricsWindow() 2015-04-07 13:42:35 +01:00
ocornut 33ef3992f7 Added IO.MetricsVertices counter 2015-04-07 13:36:11 +01:00
ocornut fe64da6197 Allow SetWindowFocus(NULL) to remove focus 2015-04-06 11:19:31 +01:00
ocornut f5310a2f2d Comments 2015-04-04 19:03:39 +01:00
ocornut 28a45877aa DragFloat() comment examples, not ready for prime-time #180 2015-04-03 16:21:24 +01:00
ocornut 916a8955ec DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound #180, removed extra APIs 2015-04-03 15:13:59 +01:00
ocornut 1247ce251f Added DragFloat(), DragInt() work in progress #180 2015-04-03 14:07:52 +01:00
ocornut e6792f84d4 Comments and organization of imgui.h 2015-04-03 10:22:18 +01:00
ocornut 503b8c20de Delete font clear pointer in ImGui state to get a clear crasah instead of a dangling pointer. #181 2015-04-02 17:48:22 +01:00
ocornut e03d2b2900 ImVec2/ImVec4 no-parameters constructs init to 0.0f. Saner. Couldn't measure perf differences in a simple stress test compiled in Debug mode 2015-04-01 15:57:09 +01:00
ocornut bb385fabd4 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-30 23:55:40 +01:00
ocornut e16f2e898a Version number 1.38 WIP 2015-03-29 10:09:14 +01:00
ocornut 26991bb2ec Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-03-26 22:09:35 +00:00
ocornut a1582874d3 Changed new ImDrawList::AddLine() half_thickness to hickness, just in time for release 2015-03-26 20:24:55 +00:00
ocornut 729e524955 Version number 1.37 2015-03-26 20:16:53 +00:00
ocornut e1de4908f6 Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up. 2015-03-26 19:18:06 +00:00
ocornut 91f8eb7b92 Added early version of BeginPopup/EndPopup() #126 2015-03-26 17:09:17 +00:00
ocornut 7e334013a0 Selectable(const char*, bool) version has bool defaulting to false 2015-03-26 16:42:46 +00:00
ocornut 743c815821 Renamed IsItemHoveredRectOnly -> IsItemHoveredRect (introduced after previous release) 2015-03-26 16:18:01 +00:00
ocornut 8b7668d24f Avoid negative clipping rectangle when collapsing windows, ImDrawList could still submit data #177 2015-03-26 16:03:30 +00:00
ocornut b04ee7e040 Added a more convenient three parameters version of Begin() which Flags more accessible. 2015-03-23 22:50:17 +00:00
ocornut e176a8b93f OCD normalising function comments not ending with a comma 2015-03-22 16:26:48 +00:00
ocornut 85f432dc8d Commented standard library include with the functions we use. Using ImFormatString in place of sprintf (part of #172) 2015-03-21 19:27:29 +00:00
ocornut b024ff85f7 Fixed comment 2015-03-21 15:15:16 +00:00
ocornut 810fcd8bcb Added mouse cursor types handling + embed mouse cursor data #155 2015-03-21 13:59:19 +00:00
ocornut d77082af00 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-21 00:54:31 +00:00
ocornut 92a22ab35f Shutdown() freeing a few extra vectors so they don't have to freed by destruction #169 2015-03-21 00:41:34 +00:00
ocornut 4cd438f663 Added IsMouseDragging(), GetMouseDragDelta() given button and lock threshold. added io.MouseDragThreshold setting. (#167) 
Removed GetItemActiveDragDelta()
 2015-03-20 11:13:18 +00:00
ocornut 2d29907611 Added GetMouseDragDelta() helper. No unlock threshold yet (#167) 2015-03-20 10:49:17 +00:00
ocornut 138e292c4b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-03-19 17:01:54 +00:00
ocornut 7a2da7cd02 Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens) 2015-03-18 22:35:51 +00:00
ocornut ed0f0dbe87 ImDrawList::AddText() takes a const ImFont* 2015-03-18 14:58:17 +00:00
ocornut dcaafffe0e Added CalcItemRectClosestPoint() helper. 2015-03-18 13:07:37 +00:00
ocornut 9f1b407def ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper. 2015-03-18 12:54:44 +00:00
ocornut 7d26e85b05 IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly(). 2015-03-18 12:10:26 +00:00
Adam D. Moss 1de735ba7c GetItemBoxMax: fix obsolete function copy-n-paste bug 2015-03-18 11:27:37 +00:00
ocornut e10d648a28 Added ImGui::GetItemActiveDragDelta() helpers for drag operations 2015-03-18 10:41:46 +00:00
ocornut 215b0065e3 Version number 1.37 WIP 2015-03-18 10:24:56 +00:00
ocornut 7665b8e5e7 Version number 2015-03-18 09:39:38 +00:00
ocornut d8026e4d84 Added VSliderInt() 2015-03-18 09:39:09 +00:00
ocornut be83c07957 Changed mentions of 'box' to be 'rect' 2015-03-17 23:41:20 +00:00
ocornut 7e297945c3 Added BeginGroup() / EndGroup() layout tools (#160) 2015-03-17 23:28:57 +00:00
ocornut da4bfe3289 Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering 2015-03-17 22:36:54 +00:00
ocornut ea720963cf Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-16 10:21:25 +00:00
ocornut 0fc9168439 Added InputInt2(), InputInt3(), InputInt4() 2015-03-15 11:30:00 +00:00
ocornut 44826972c0 Added Indent(), Unindent() 2015-03-15 11:19:10 +00:00
ocornut edde703f8f Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing 2015-03-15 11:10:48 +00:00
ocornut 1ac4f33736 Added VSliderFloat() 2015-03-15 01:58:14 +00:00
ocornut 98eeeab025 Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar() 2015-03-15 01:23:56 +00:00
ocornut 4d78c5c9ab Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters) 2015-03-13 13:15:01 +00:00
ocornut 1c1a55f6b1 Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused() 2015-03-13 12:25:43 +00:00
ocornut 0911526424 Added io.KeyAlt + support in examples apps 
Currently unused but supported by sample so that more people will have
it set up when menus needs them
 2015-03-13 09:49:38 +00:00
ocornut 58dc3f97c5 WIP marker in uppercase.. (#127) 2015-03-11 16:45:58 +00:00
ocornut 5d1c381509 Update version number, added IMGUI_VERSION, ImGui::GetVersion() (#127) 2015-03-11 16:44:54 +00:00
ocornut 378eee490b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-03-09 18:06:39 +00:00
ocornut d440a13b7e Version number 2015-03-09 17:30:22 +00:00
ocornut 32312e538e Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing. 2015-03-08 15:03:55 +00:00
ocornut 2af8e0238c Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150) 2015-03-08 12:04:38 +00:00
ocornut a5daea9408 Added style.GrabSizeMin 2015-03-08 11:43:57 +00:00
ocornut 849c72c5c3 Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h 2015-03-08 11:32:39 +00:00
ocornut e01500f046 Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154 2015-03-07 12:18:01 +00:00
ocornut 8ca3dc8e41 Merge: First pass on AA rendered primitives from https://github.com/memononen/imgui 2015-03-06 23:39:38 +00:00
ocornut e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly. 
User need to set io.ImeWindowHandle
 2015-03-06 21:11:14 +00:00
ocornut 0ffd99d319 Font: fix for fallback character width. 2015-03-06 19:17:20 +00:00
ocornut 8691c5ca42 Version number + commented failing test case 2015-03-03 15:52:56 +00:00
ocornut f4458f7571 Version number 2015-03-02 10:10:46 +00:00
ocornut 40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once 2015-02-27 09:51:11 +00:00
ocornut 2177b11682 Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode() 2015-02-27 09:38:22 +00:00
ocornut ea17240b96 Spacing 2015-02-27 09:16:12 +00:00
ocornut ebe363c951 Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name. 2015-02-27 09:07:25 +00:00
ocornut 6d89285f59 Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() (#146) 2015-02-27 09:01:12 +00:00
ocornut fe48562171 Comments for IMGUI_API 2015-02-25 23:10:17 +00:00
ocornut c51be42f28 Added Bullet() + usage examples 2015-02-23 20:59:22 +00:00
ocornut 0df8ff6931 Version number 2015-02-23 20:52:33 +00:00
ocornut e022e5cff6 Version number 1.33 2015-02-22 18:16:25 +00:00