Commit Graph

3545 Commits (4786321754cf2c69dc6a0a1e803d18a726ce05ef)
 

Author SHA1 Message Date
Gustav 08a9e78da5 fixed space issues
Håvard Mathisen 99b4f951b9 Fix Vulkan example for use when a depth buffer is active.
Gustav 5def10c3a0 Fixed OpenGL error when calling Shutdown without calling NewFrame
omar b36ba12929 Travis test fix
ocornut 5ae71aa04a Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
ocornut 3c384c2f10 Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
ocornut ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 63d47bc5a4 ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 ()
ocornut 82768e05f3 Ignore list for Visual Studio
ocornut 787a802f2e Merge branch 'martty-master'
Marcell Kiss 4bc6a951fe tabs to space, remove braces
Marcell Kiss 3234f81cb1 maxImageCount may be 0; add missing sType; change to 1 push constant range
omar 622715725d Merge pull request from bear24rw/patch-1
Demo: Add null terminator to ShowStyleEditor() output_type combo options
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.
ocornut cff815fd2d Merge branch 'master' into 2016-02-colorpicker
ocornut 0f9addb002 Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway)
ocornut bfe1e163b8 Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 4bc3f9d1f7 Minor shuffle to ease merging branches.
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 6eb35b8a04 BulletText(): doesn't stop displaying at the ## mark
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()
ocornut aa9786077c Merge branch 'thedmd-2016-08-generalized_visibility_test'
ocornut b8397c2933 Tweak comments ()
ocornut a1521534ba Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test
ocornut af33efb146 Using IM_COL32() for colors in a few spots ()
ocornut a7f6ea592f Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ()
Michał Cichoń 7588dfb67e Add ability to test arbitrary rectangle for visibility without need of moving cursor.
ocornut 907265d632 Using ImGuiID instead of ImU32 is a few places
omar 9ab20e6c9c Merge pull request from jseward/master
Examples: SDL: Fix compile warnings.
Jamie Seward 0a1d456de1 Fix compile warnings in SDL examples
ocornut 954c890c67 SameLine() with explicit X position is relative to left of group/columns (ref , , )
omar cabba0f158 Update README.md
ocornut 4a4d3eab70 Merge branch 'michaelbartnett-add-osx-homeend-keys'
ocornut 7086a17854 InputTextEx: got rid of unnecessary locals.
ocornut 776ea6b946 InputTextEx(): more shallow tidying up, still being cautious with this function
ocornut 666d83b5c7 InputText/IO: Got rid of individual OSX options in ImGuiIO, added io.OSXBehaviors (, )
ocornut 0ff22dbf0b InputTextEx(): minor tidying up
ocornut e5b6ddde26 InputText(): minor tidying up/simplification following changes for osx style improvements ()
ocornut 802e91f69e Merge branch 'add-osx-homeend-keys' of https://github.com/michaelbartnett/imgui into michaelbartnett-add-osx-homeend-keys
ocornut d8dacd729b Examples: SDL+OpenGL: explicitly setting GL_UNPACK_ROW_LENGTH to reduce issues because SDL changes it ()
ocornut bccd3d8a32 Merge branch 'nProtect-master'
ocornut 8efd05a148 Tab->Spaces, missing spaces, typos
Adisorn Aeksatean 4141144b21 Added GetGlyphRangesThai()
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. ()
Pushing in master because it _should_ be a no-op but I'd rather test for any issue in Begin() as soon as possible.
ocornut 19d02becef Closing the focused window restore focus to the first active root window in descending z-order (part of )
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.
ocornut 4961b2ea18 Speculative build fix for FreeBSD+GLIBC configuration
See
a1f9b62dd0
ocornut 44a13a7f25 Windows: No default IME handler when compiling using GCC. ()
ocornut 04b36bc397 TODO list
ocornut 81036ee46f InputTextMultiline(): fix so that IsItemActive() can be used afterwards (otherwise the info was lost by using child/group)