moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,367 Commits 4 Branches 0 Tags
3234f81cb17a2dc0b8d63bf4ae8a610f93f9a1ce
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut 0f9addb002 Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway) 2016-08-11 23:20:53 +02:00
ocornut 4bc3f9d1f7 Minor shuffle to ease merging branches. 2016-08-11 22:59:44 +02:00
ocornut 6eb35b8a04 BulletText(): doesn't stop displaying at the ## mark 2016-08-07 13:53:41 +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 aa9786077c Merge branch 'thedmd-2016-08-generalized_visibility_test' 2016-08-06 09:40:38 +02:00
ocornut b8397c2933 Tweak comments (#768) 2016-08-06 09:40:26 +02:00
ocornut a1521534ba Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test 2016-08-06 09:36:24 +02:00
ocornut af33efb146 Using IM_COL32() for colors in a few spots (#767) 2016-08-06 09:35:05 +02:00
ocornut a7f6ea592f Moved GetColorU32 out of imgui_internal.h to avoid inlining mess (#759) 2016-08-06 09:22:41 +02:00
ocornut 907265d632 Using ImGuiID instead of ImU32 is a few places 2016-07-31 16:48:06 +02:00
ocornut 954c890c67 SameLine() with explicit X position is relative to left of group/columns (ref #746, #125, #630) 2016-07-30 23:41:44 +02:00
ocornut 4a4d3eab70 Merge branch 'michaelbartnett-add-osx-homeend-keys' 2016-07-29 11:06:27 +02:00
ocornut 7086a17854 InputTextEx: got rid of unnecessary locals. 2016-07-29 11:06:16 +02:00
ocornut 776ea6b946 InputTextEx(): more shallow tidying up, still being cautious with this function 2016-07-29 11:01:06 +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 0ff22dbf0b InputTextEx(): minor tidying up 2016-07-29 10:51:35 +02:00
ocornut e5b6ddde26 InputText(): minor tidying up/simplification following changes for osx style improvements (#650) 2016-07-29 10:42:08 +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 d8dacd729b Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it (#752) 2016-07-29 10:10:41 +02:00
ocornut bccd3d8a32 Merge branch 'nProtect-master' 2016-07-20 11:39:53 +02:00
ocornut 8efd05a148 Tab->Spaces, missing spaces, typos 2016-07-20 11:39:38 +02:00
ocornut ffdd7d7f17 Begin: Moved code that calls FocusWindow() on a newly appearing window lower in the function so that Nav branch can use CursorStartPos on the first window frame. (#323) 
Pushing in master because it _should_ be a no-op but I'd rather test for any issue in Begin() as soon as possible.
 2016-07-18 15:25:44 +02:00
ocornut 19d02becef Closing the focused window restore focus to the first active root window in descending z-order (part of #727) 2016-07-17 19:17:49 +02:00
ocornut e215905765 Fixed scrolling offset when using SetScrollY(), SetScrollFromPosY(), SetScrollHere() with menu bar. 
Tests:
a) add SetScrollY(+20) after Begin("ImGui Demo") test with/without title/menu.
b) add ImGuiWindowFlags_MenuBar in BeginChild() in scrolling tracking demo.
 2016-07-16 18:12:41 +02:00
ocornut 4961b2ea18 Speculative build fix for FreeBSD+GLIBC configuration 
See
https://github.com/mamedev/mame/commit/a1f9b62dd0a491d6b26291837d43181c0e9e66fa
 2016-07-16 11:44:10 +02:00
ocornut 44a13a7f25 Windows: No default IME handler when compiling using GCC. (#738) 2016-07-16 11:29:41 +02:00
ocornut 04b36bc397 TODO list 2016-07-14 13:38:44 +02:00
ocornut 81036ee46f InputTextMultiline(): fix so that IsItemActive() can be used afterwards (otherwise the info was lost by using child/group) 2016-07-14 13:27:14 +02:00
ocornut c0f77f12ea InputText(): Fixed state corruption/crash bug in stb_textedit redo logic when exhausting undo char buffer (#715 #681) 2016-07-14 13:08:37 +02:00
ocornut 88721118fd InputTextEx: comments (related to #725) 2016-07-13 01:54:29 +02:00
ocornut d9e2e688e9 InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. (#725) 
Partial fix, won't stop ids from functioning because of a zombie id.
 2016-07-13 01:18:59 +02:00
ocornut 9c71ec38f0 ImVector: reserve() tweak to avoid undefined behavior warning (#731) 2016-07-12 11:19:38 +02:00
ocornut 5525c2356a Using GetCurrentWindowRead() instead of GetCurrentWindow() 2016-06-29 10:30:42 +02:00
ocornut fe7274b6c7 SetCursorScreenPos() fixed not adjusting CursorMaxPos as well 2016-06-29 10:25:47 +02:00
ocornut b9b3dec7da ImGuiListClipper: Fix to behave within column (#661, #662, #716) 2016-06-29 10:19:01 +02:00
ocornut 74bbfcfaa6 ImGuiListClipper: fixed automatic-height calc path dumbly having user display element 0 twice (#661, #716) 
First bug out of two. Was easily visible using e.g. 50% alpha text.
 2016-06-29 10:07:36 +02:00
ocornut 297bb3fc92 NextColumn() tidying up with a sane early out 2016-06-29 09:53:02 +02:00
ocornut ba7acdac47 Added assert to track stb_textedit.h issue (#715) 2016-06-27 12:59:49 +02:00
ocornut c36fd541ad InputTextMultiline(): Fixed Ctrl+DownArrow moving scrolling out of bounds 2016-06-27 09:56:45 +02:00
ocornut e06852abaf Fixed Windows default clipboard leaving its buffer unfreed on application's exit. (#714) 2016-06-26 13:24:30 +02:00
ocornut de61fcc619 Minor bits 2016-06-25 17:03:49 +02:00
ocornut 355dae5d99 Comments amend 3c8e490778 (committed before saving last comment edit) (#703) 2016-06-25 14:37:14 +02:00
ocornut 3c8e490778 Comment on dealing with io.WantCaptureKeyboard (#703) 2016-06-25 14:28:58 +02:00
ocornut 13615a1318 InputText: render currently edited buffer from the internal buffer, toward #701 2016-06-25 13:57:05 +02:00
ocornut 2f4e2eec68 InputText, ImGuiTextFilter: using strncpy instead of printf("%s"). 2016-06-25 13:54:34 +02:00
ocornut 4621b357c1 Wrapped text: fixed incorrect testing for negative wrap coordinates, they are perfectly legal. (#706) 2016-06-19 12:50:22 +02:00
ocornut 92bff4c8d7 ColorEdit4(): better preserve inputting value out of 0..255 range, display then clamped in Hexadecimal form 2016-06-16 23:09:48 +02:00
ocornut 9cb271f4c8 Fixed minor text clipping issue in window title for when using font straying above usual line (#699) 2016-06-15 23:09:40 +02:00
ocornut c4db79f34b Member variable name renamed "ID" "Id" for casing consistency 2016-06-12 22:27:15 +02:00
ocornut f83790dc5a Comments 2016-06-12 12:23:20 +02:00
ocornut 9f21c7189f TextUnformatted() fixed clipping bug in the large-text path when horizontal scroll has been applied (#692, #246) 2016-06-12 12:23:16 +02:00
ocornut d79186931e ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command 2016-06-11 15:42:10 +02:00
ocornut 3fd3eac370 Fixed TextWrapped() override wrap position is one is already set (#690) 2016-06-11 10:23:37 +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 4fddfa4b5e Demo: extra (somehow duplicate) Selectables+Columns demo 2016-06-07 09:05:36 +02:00
ocornut d6a5fd06d7 Demo: Added an extra 3-way columns demo 2016-06-07 08:46:50 +02:00
ocornut 0f36ec9cb9 Fixed a crash bug in stb_textedit.h (#681) 2016-06-04 14:48:08 +01:00
ocornut 8291d7dc7c Fixed minor bug introduced in 45dacbf084 (#682) 
Actually minor because nobody uses that value. Still a terrible
bug.
 2016-05-31 22:34:48 +02:00
ocornut d1c073a199 Comments, tweaks 2016-05-31 00:00:44 +02:00
ocornut 254a1a9e4c InputText: Added support for CTRL+Backspace. 2016-05-30 20:00:20 +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 0fb51b6b4b Removed various superflous ImGui:: prefixes in internal code 2016-05-29 18:58:41 +02:00
ocornut 9886c1b43d Undo modification of ContentsRegionRect.Max, too many side-effects (undo dff078365f) 2016-05-29 18:37:26 +02:00
ocornut dcef7dedce Comments (#590) 2016-05-29 18:24:02 +02:00
ocornut 784e1ef053 CollapsingHeader() with close button adapt to horizontal scrolling (#600) 2016-05-29 18:12:25 +02:00
ocornut dff078365f Fix selectable/tree node not reaching right-side of contents size when horizontal scrolling is active and no explicit size is known 2016-05-29 18:08:51 +02:00
ocornut 45dacbf084 Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect. 
Relates to horizontal scrollbar, explicit contents size
 2016-05-29 17:50:23 +02:00
ocornut 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 b5521a81d4 Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection (#581) 2016-05-28 14:18:46 +02:00
ocornut 8f4b123e1b SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668) 2016-05-28 14:02:14 +02:00
ocornut 213025f3cd BeginMenu: a menu that becomes disabled when open gets closed down, facilitate user's code (#126) 2016-05-28 11:14:02 +02:00
ocornut 65b1ae6ecc Comments (#335) 2016-05-22 10:20:58 +02:00
ocornut e3d8055d90 Speculative 64-bit warning fix (#668) 2016-05-21 23:13:11 +02:00
ocornut 3a776d93f2 Fixed compile issue (bloody git stashes) (#668) 2016-05-21 23:03:21 +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 713730af0c Minor sizing refactor, should be no-op. Making it a commit for further bisection since sizing code is super brittle. (#668) 2016-05-21 20:55:28 +02:00
ocornut 102d03a7eb Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. (#668) 
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
 2016-05-21 20:50:15 +02:00
ocornut 81bf5aeb09 Minor bits 2016-05-21 20:07:51 +02:00
ocornut b4302187dd ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field. 2016-05-17 19:47:13 +02:00
ocornut 1dfafeb602 CheckStacksSize() added literal strings in IM_ASSERT calls to reach end-user on common failure 2016-05-17 09:36:27 +02:00
ocornut 0e51f91c5e Including limits.h again to get INT_MAX, assuming previous report of missing limits.h was erroneous (#1, yes, issue ONE!) 2016-05-16 20:27:52 +02:00
ocornut 69a29e4715 Added NewLine() (very shy reminder that #97 isn't done) 2016-05-16 20:14:07 +02:00
ocornut 47d10944a5 Build fix 2016-05-16 20:07:02 +02:00
ocornut 787be01e61 ImGuiListClipper comments (#660, #661, #662) 2016-05-16 20:03:18 +02:00
ocornut f291f2c5dd InputText(): Fixed cursor rendering on first character when framepadding is 0.0 (following #601) 2016-05-16 19:44:03 +02:00
ocornut 28b09199de ImGuiListClipper: removed assert (#662) 2016-05-16 19:25:42 +02:00
ocornut 7a28f5bb81 ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662) 2016-05-16 19:22:51 +02:00
ocornut fa5ae60bce Demo: added decorated label to some vertical sliders. 2016-05-16 12:05:26 +02:00
ocornut 82fa628135 Merge branch 'trezanik-master' 2016-05-16 10:55:04 +02:00
ocornut 1349d0aacf Examples: DirectX9: Removing spaces (#663) 2016-05-16 10:54:52 +02:00