mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,584 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

2584 Commits

Author SHA1 Message Date
ocornut 031d4e689d Examples: OpenGL3: Revert Makefile change for OSX for now (#812) 2016-09-05 22:52:45 +02:00
omar 3a699e7264 Update README.md 2016-09-05 13:40:04 +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
omar 056e49eec1 Merge pull request #812 from linkemars/master 
Examples: opengl3 glfw: Mac makefile - correct name for linking opengl3_example
 2016-09-02 15:00:49 +02:00
Kun Lin aa0cb13aa4 Correct name for linking opengl3_example 
According to glfw offcial site, linking `libglfw.3.dylib` etc should
use `-lglfw`.

Changed this made the compilation on my Mac successfully.
 2016-09-02 21:57:31 +09:00
omar 9af74181ce Merge pull request #804 from Loftilus/master 
Examples: Vulkan: Fix Vulkan example for use when a depth buffer is active.
 2016-09-01 09:23:46 +02:00
Gustav 08a9e78da5 fixed space issues 2016-08-29 23:35:56 +02:00
Håvard Mathisen 99b4f951b9 Fix Vulkan example for use when a depth buffer is active. 2016-08-27 19:08:24 +02:00
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame 2016-08-27 00:32:20 +02:00
omar b36ba12929 Travis test fix 2016-08-25 16:20:34 +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 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
Marcell Kiss 4bc6a951fe tabs to space, remove braces 2016-08-20 13:27:03 +02:00
Marcell Kiss 3234f81cb1 maxImageCount may be 0; add missing sType; change to 1 push constant range 2016-08-20 13:08:34 +02:00
omar 622715725d Merge pull request #783 from bear24rw/patch-1 
Demo: Add null terminator to ShowStyleEditor() output_type combo options
 2016-08-19 18:00:27 +02:00
Max Thrun 4f389b7f6a Add null terminator to ShowStyleEditor output_type combo options 
Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.
 2016-08-18 11:00:23 -07:00
ocornut 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
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 907265d632 Using ImGuiID instead of ImU32 is a few places 2016-07-31 16:48:06 +02:00
omar 9ab20e6c9c Merge pull request #756 from jseward/master 
Examples: SDL: Fix compile warnings.
 2016-07-31 09:28:21 +02:00
Jamie Seward 0a1d456de1 Fix compile warnings in SDL examples 2016-07-30 15:26:49 -07: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
omar cabba0f158 Update README.md 2016-07-29 18:52:38 +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
Adisorn Aeksatean 4141144b21 Added GetGlyphRangesThai() 2016-07-20 11:37:08 +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
a1f9b62dd0
 2016-07-16 11:44:10 +02:00