moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,471 Commits 4 Branches 0 Tags
ccb3db94dadde9cb4a9185d33c66809d764987e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut ccb3db94da Merge branch 'master' into 2016-02-colorpicker 2016-11-09 15:17:20 +01:00
ocornut faafcf418d Demo: Comments, even though nobody appears to read the comments. 2016-11-07 17:33:46 +01:00
ocornut 3689efb726 Font: Readme about icons 2016-11-06 22:53:36 +01:00
ocornut da9feba539 Fixed missing frame padding on title bar text when Collapse triangle is disabled 2016-11-06 22:40:47 +01:00
ocornut 620497e466 Font: Font name include size 2016-11-06 22:21:21 +01:00
ocornut 84f480a638 Font: Added Roboto-Medium + tweaked readme 2016-11-06 22:21:10 +01:00
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" 2016-11-06 21:51:20 +01:00
ocornut b376b68326 Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code 2016-11-06 21:50:18 +01:00
ocornut 357167f917 Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing. 2016-11-06 18:13:14 +01:00
ocornut 907dd2ed20 Comments (#896) 2016-11-06 15:25:28 +01:00
ocornut ddf08ec2e8 BeginChild(const char*) applies stack id to provided label (#894, #713) 2016-11-06 15:12:50 +01:00
ocornut dd6163241c Merge branch 'master' into 2016-02-colorpicker 2016-10-16 14:02:15 +02:00
ocornut b3790e7549 InputText: Fixed pressing home key on last character when it isn't a trailing \n (#588, #815) 2016-10-16 13:34:47 +02:00
ocornut 7252d93dcd stb_textedit.h Merged from master 1.9 (merged bits from #473) 2016-10-16 11:34:33 +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 cb7e1c18b5 Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle (#860) 2016-10-10 22:37:59 +02:00
ocornut 31dc7d8d63 Added ImGuiMouseCursor_None for usage by app/binding 2016-10-10 18:03:37 +02:00
ocornut 4de35b4f30 Removed left-over empty op 2016-10-09 10:58:38 +02:00
ocornut 1810b3ff38 Added ImGuiCorner enum to clarify some internal code 2016-10-09 10:56:23 +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 abaada4224 Removed the inconsistent shadow under RenderCollapseTriangle() (~#707) 2016-10-09 10:31:39 +02:00
ocornut 5957af8a80 Fixed not using IM_ARRAYSIZE() where appropriate 2016-10-09 10:08:03 +02:00
ocornut fa73e5aa0e Plot: Fixed calling with values_count == 0 2016-10-08 12:43:30 +02:00
ocornut 51111b0ed5 FAQ clarified the ClipRect entry a little 2016-10-07 10:27:19 +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 05b580e691 Tools: Fixed binary_to_compressed_c.cpp not to use different types on both sides of ternary op (#856) 2016-10-02 17:25:09 +02:00
ocornut a2487bc143 Minor tweaks 2016-10-01 15:16:17 +02:00
ocornut 9896faf731 Merge branch 'madeso-master' 2016-10-01 15:00:00 +02:00
ocornut 2919c77bee Examples: GLFW+OpenGL3: Fixed Shutdown() calling GL functions with NULL parameters if NewFrame was never called (#800) 2016-10-01 14:59:28 +02:00
ocornut b96471143f Merge branch 'master' of https://github.com/madeso/imgui into madeso-master 2016-10-01 14:56:24 +02:00
ocornut 28974dfbbb Merge branch 'thedmd-2016-08-use_bgra_colors' 2016-10-01 14:29:27 +02:00
ocornut 68c81739bf Minor tidying up following merge BGRA color PR (#844) 2016-10-01 14:29:12 +02:00
ocornut eb0382a1c1 Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors 2016-10-01 14:19:25 +02:00
ocornut dfe4683c17 EndGroup(): Made IsItemHovered() work when an item was activated within the group (#849) (loosely follows #840) 2016-10-01 14:10:24 +02:00
ocornut 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered. 2016-09-25 15:52:04 +02:00
ocornut d7c518e6cc ShowStyleEditor: show font map / grid in more details. 2016-09-25 15:22:41 +02:00
ocornut 6def01be5d Fixed IsItemActive() lagging by one frame on initial widget activation (#840) 2016-09-25 14:32:38 +02:00
ocornut f2699de242 Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479) 2016-09-25 14:18:10 +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 de9f8944ea Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect* 2016-09-25 11:38:04 +02:00
ocornut 02cea0c3c3 Comment 2016-09-25 11:16:19 +02:00
ocornut 281898e82e Tidying up PushStyleVar/PopStyleVar() a little more (#842) 2016-09-25 11:14:10 +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 35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder (#839) 2016-09-23 09:09:07 +02:00
ocornut 7f51929dc4 Tools: binary_to_compressed_c: Avoid ?? trigraphs sequences in string outputs (#839) 2016-09-23 09:06:19 +02:00
ocornut 6e87f071b8 Shutdown() clear out some remaining pointers (#836) 2016-09-20 12:41:21 +02:00
ocornut 87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df) 2016-09-19 09:32:21 +02:00
ocornut 0420ab027e Metrics: Displaying window position + moving extraneous line in IsPopupOpen(). 2016-09-16 01:09:57 +02:00
ocornut b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829) 2016-09-13 09:18:17 +02:00
ocornut 612b17ef57 Fixing minor english typos (#827) 2016-09-11 22:02:35 +02:00
ocornut 02399852fe Examples: OpenGL2: Uploading font texture as RGBA32 to increase compatibility with users shaders for beginners (#824) 2016-09-10 17:43:17 +02:00
ocornut f6d4ca6473 TODO list 2016-09-07 12:02:37 +02:00
ocornut bc57fd5d1d Examples: OpenGL*: Savnig/restoring existing scissor rectangle for completeness (#807) 2016-09-05 23:39:52 +02:00
ocornut 031d4e689d Examples: OpenGL3: Revert Makefile change for OSX for now (#812) 2016-09-05 22:52:45 +02:00
ocornut 2825eaa0be Examples: Accessing ImVector fields directly, feel less stl-ey and fix renderer side assert when render list only contains a callback (#810) 2016-09-03 19:24:57 +02:00
ocornut c0fcf223be Fixed assert triggering when a window has zero rendering but has a callback (#810) 2016-09-03 19:02:57 +02:00
ocornut 5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:25:51 +02:00
ocornut 3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git) 2016-08-25 10:18:09 +02:00
ocornut ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-23 17:00:47 +02:00
ocornut 63d47bc5a4 ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 (#793) 2016-08-23 16:55:06 +02:00
ocornut 82768e05f3 Ignore list for Visual Studio 2016-08-20 13:30:42 +02:00
ocornut 787a802f2e Merge branch 'martty-master' 2016-08-20 13:30:10 +02:00
ocornut cff815fd2d Merge branch 'master' into 2016-02-colorpicker 2016-08-11 23:22:15 +02:00
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 bfe1e163b8 Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-11 23:01:48 +02:00
ocornut 4bc3f9d1f7 Minor shuffle to ease merging branches. 2016-08-11 22:59:44 +02:00
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker 2016-08-11 22:53:26 +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