Commit Graph

1124 Commits (c0af35098a30e53ca830ebefc173c2c9d6a7e4f4)

Author SHA1 Message Date
ocornut 8ca3dc8e41 Merge: First pass on AA rendered primitives from https://github.com/memononen/imgui
ocornut e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
User need to set io.ImeWindowHandle
ocornut 0ffd99d319 Font: fix for fallback character width.
ocornut 8691c5ca42 Version number + commented failing test case
ocornut f4458f7571 Version number
ocornut 40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
ocornut 2177b11682 Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode()
ocornut ea17240b96 Spacing
ocornut ebe363c951 Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name.
ocornut 6d89285f59 Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() ()
ocornut fe48562171 Comments for IMGUI_API
ocornut c51be42f28 Added Bullet() + usage examples
ocornut 0df8ff6931 Version number
ocornut e022e5cff6 Version number 1.33
ocornut bab81318a9 Comments and changed ImVec2 parameters to const ImVec2&
ocornut 835a46effb Comments
ocornut 00e281bef1 Version number
ocornut 242a52abba InputText: minor tidying up.
ocornut 2f9ef13be3 Comments
ocornut 4deeaea93c BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content.
ocornut f2752584e2 Added IsAnyItemActive()
ocornut c1f20f03c5 ImGuiTextFilter() can take a default filter string
ocornut dbdbaec3eb Version number + comment
ocornut cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature
..and to reduce sample code size a little.
ocornut a597664672 Added ImGuiInputTextFlags_CharsNoBlank stock filter. Tweak examples.
ocornut 2df4735904 ImGuiInputTextFlags_CallbackCharFilter can return 1 to filter character
ocornut b73484a66b Added ImGuiInputTextFlags_CharsUppercase stock filter
ocornut 9473cd491e InputText(): added ImGuiInputTextFlags_CallbackCharFilter system for filtering/replacement. Callback now passed an "EventFlag" parameter.
ocornut 1da8a52ce7 CalcTextSize*() functions which are often speed bottleneck for large contents are about 25% faster.
Caching character advance contiguously, pulled inline, no int->float
conversion.
ocornut 6347179bb0 Added ListBox() ()
Along with ListBoxHeader(), ListBoxFooter() helpers.
ocornut c26af284db Tweaks. Combo default height_in_items is -1 at compilation time to match incoming ListSelect() behavior
ocornut 801ed2c472 Allow passing -0.01f to PushItemWidth() for a perfect right-side alignment + fix CalcItemWidth()
ocornut e7f51172c1 BeginChildFrame() / EndChildFrame() helpers.
ocornut 1e9f6cce7f PushItemWidth() can take negative value to right-align items. Renamed GetItemWidth() to CalcItemWidth()
ocornut 8532da3f52 Added BeginChild() variant that takes an ImGuiID
ocornut c6d42b1a54 Added Selectable() building block for various list boxes, combo boxes
ocornut da2f5d9c48 Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility
Upcoming features using it.
ocornut 8e8cb7de3f Fixed title bar text clipping issue (fix )
+ Update version number
ocornut 734cf47e71 Version number
ocornut c907108c23 SetNextWindowPos api before SetWindowPos api in .h + comments
ocornut f84166dda9 Use cpu-side clipping instead of a new draw call for isolated label-clipped-by-frame cases.
ocornut 9e3f8adfac Added CalcListClipping() helper.
ocornut 29e0aad739 Renamed GetTextLineSpacing to GetTextLineHeightWithSpacing. Added GetCursorPosX/GetCursorPosY
Václav Patejdl d135d91e27 Added tint_col parameter to ImageButton
ocornut 209ab823d6 Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig.
ocornut e36fad65dd Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
Conflicts:
	imgui.cpp
ocornut c6de9502f8 Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window
ocornut 94c7eddb17 Comments
ocornut 5df28b101d Added ImGuiWindowFlags_NoCollapse flag
Jim Tilander e6318abcee Merged changes from original master
ocornut cc3d41dbab Version number 1.31 wip
ocornut bde3f6b90d Removed the dependency on realloc functionality + fixed one alloc in NewFrame()
ocornut 56bf9ea067 Added comment on MemFreeFn as suggested by
ocornut e636e0d2aa Warning fixes (fix )
Jim Tilander 3478e3a708 Enabled us to create the internal state on client side allocated memory, e.g. a heap
Jim Tilander 8149bace7b Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs)
Jim Tilander 98e71afa72 Removed the dependency on realloc functionality
ocornut a548c9b0d5 Version change
ocornut ca10c49e27 Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor
ocornut 68bad703ee ImColor::HSV() helper + color buttons demo
ocornut 8d1583d611 Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha.
ocornut cb3b69c879 Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32
ocornut 3cf47988b0 Added ImageButton() using regular framing + override framing size ()
ocornut 2ecc285919 ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget))
ocornut 4437293b79 Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments
ocornut 27161d2a98 Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
+ remove duplicated "Setup outer clipping rectangle" block in Begin))
ocornut 07f69966f8 ImDrawList::AddImage() color parameter defaults to white
ocornut 79042a3a3c GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef
Daniel Collin c9c41c3874 Added Set/GetVoidPtr in ImGuiStorage
ocornut 7530f3c985 Added IsItemActive() - replace IsItemFocused()
ClipAdvance() --> ItemAdd() - nb: return value is inverted
ocornut 70188c5623 Added comments
ocornut 26174cba85 Added InvisibleButton()
ocornut 56ac857cac Added stub for obsolete GetDefaultFontData() to help the user upgrading
ocornut 1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments.
ocornut 1f8d209202 Fixed more clang warnings + AddFontFromMemoryTTF() not honoring font_no parameter
ocornut 2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
ocornut cb9a3235be Removed PixelCenterOffset, uncesssary
ocornut 014f88b1fc Font fixes for horizontal centering within frames
ocornut 3e30ad3802 PushFont/PopFont changes texture at high-level in current draw list - faster
ocornut 7ebd7ef9ac Added PushFont/PopFont API
ocornut ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
	imgui.cpp
	imgui.h
ocornut 584c7ffac8 Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos)
ocornut 02f0dbca37 ColorEdit3: clicking on color square change edit-mode, removing color-edit mode button by default.
ocornut 8ba93d947c Added FrameRounding setting (default to 0 for now).
ocornut 3a20671802 Fixed logging to clipboard on architectures where va_list are modified by vsnprintf (fixed )
ocornut e2d8c03e1a Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
+ removed unnecessary destructor
ocornut 0f4d74d614 ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
ocornut 241e8086fa Mde it optional to new() io.Font - however it stills needs to be loaded.
ocornut cc79b85c28 Added first-pass of Image() based on + demo
ocornut 1a6e7f25e0 ImVector: less hoops in back() / front(), more friendly for debugger and unoptimized builds
+ fixed typos
ocornut f77490cb2d Cleanup extra_fonts/ folder
ocornut b3a208901a Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
ocornut b0ea57e518 Version number
Mikko Mononen 91684a428b Merge upstream
Mikko Mononen d9757bb583 First pass on AA rendered primitives
ocornut 0505995193 Very minor code/comments tweaks.
ocornut 22c1d7eded Renamed some color enums
ocornut 39373b563b Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI
ocornut 12225abfe2 Version number (fix)
ocornut f8c58fe328 Fix for Clang
ocornut da5227fa28 Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
ocornut 2d111ccb55 crc32 on strings is performed in one pass - removed the strlen() call.
ocornut 691ca46978 Version number
ocornut 929f127d06 Added SliderInt2(), SliderInt3(), SliderInt4() for consistency
ocornut 036a153cf4 Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText().
ocornut 886d954e3d GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing
ocornut 39952d2362 Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers
ocornut 1b25fa8169 Added LogFinish() to stop logging at an arbitrary point.
ocornut e2fbbe0274 Factoring bits out of Begin() into a private CreateNewWindow() funciton
(Hopefully to ease a bit the merging work for ProDBG)
ocornut 5b7ed5432e CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it)
ocornut 90351298d1 Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin().
ocornut a3af51fd4e Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API
omar 7e868e2842 Cleanup todo list, removed 3 done items + added 1 new
omar 0056ccce26 Version number
omar e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
omar 3399890a84 Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app.
omar 2a3bff9a82 Comments
omar cca5f473ca Clarified comment
omar bdb2344db0 ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading?
ocornut e43cd6e97f Added IMGUI_INCLUDE_IMGUI_USER_H
omar 6b16424faf Comments.
omar 860cf578f5 Added ImGuiWindowFlags_NoScrollWithMouse flag.
ButtonBehaviour test hovering of CurrentRootWindow (vs CurrentWindow, different for child-windows). This is intentionally meant to fix grabbing the lower-right resize grip when lower-right corner has a child-window, but may be the overall right-er test. Testing out.
omar d31623061f ImVector: private -> protected
ocornut 7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks.
ocornut e835ef1d90 Fix from incorrect change left-over in a31e44b99a
ocornut 214c967df8 Example code: warning fix + comments.
omar 31654958f9 Merge pull request from memononen/master
Smoother mouse wheel scrolling
ocornut a31e44b99a Fixed Clang -Weverything warnings + TODO list entries
Mikko Mononen eb789c0288 Smoother scrolling
- changed IO.MouseWheel to float, allows smoother scrolling
ocornut e9aead09cb Remove unneeded extra parameter from ImFont::FindGlyph()
ocornut e4a79e9fc8 Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale)
ocornut e27eddfbd2 Grammar fix + ocd alignment
ocornut 311a2f8328 New version of IMGUI_ONCE_UPON_A_FRAME helper macro
ocornut df2ad5e899 Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef
omar b9118750ae Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers
ocornut 49defcf083 InputText support for completion/history/custom callback + added fancy completion example in the console demo app
Unfortunately quite messy because of the UTF-8 <> wchar confusion going
around. Not well tested for UTF-8 compliance with non-Ascii characters.
omar 8c4fcf1359 Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first.
omar 5f8175abaa Version number
omar cf037b4769 PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar
ocornut 97192606a6 Fixed Tab > space
ocornut 2aee4419e3 Fixed compatibility with std::vector if user decide to #define ImVector
ocornut f3bd033b6d More fixes for ultra pedantic Clang -Weverything
Daniel Collin b01adf16de Fixed more Clang warnings
omar c6f3d0924e Default 'text_end' parameter for low-level AddText/CalcTextSizeA functions
ocornut 191e17eaf8 Added IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT
omar 4205241e86 PushTextWrapPos() defaults to 0.0
omar ee3355fe8e Version number
omar 1e30400f80 Added PushStyleVar(),PopStyleVar() helpers.
BeginChild() allows to specify negative sizes to specify "use remaining minus xx".
Added a simple example console into the demo window.
omar 3a64c77826 Renamed IsHovered() to IsItemHovered()
omar e19f0d370a Added dummy IMGUI_API definition in front of entry-points for silly DLL action
omar 6c192f3221 Added GetContentRegionMax() supporting columns. Some bug fixes with using columns.
omar 78645a7dba Added word-wrapping API TextWrapped(), PushTextWrapPos(), PopTextWrapPos()
Added word-wrapping sample in the test window.
Added IsItemFocused() to tell if last widget is being focused for keyboard input.
ocornut 3d84858755 Made with the NoResize flag can still use auto-fitting. Added SetWindowSize().
ocornut fad5e45d2c Minor tweaks
Jarrett Billingsley 85eee4a4c5 Added overloads of ImGui::PlotLines and ImGui::PlotHistogram which take a value getter function instead of raw value data, and changed the implementation of the original overloads to use this new implementation.
ocornut e6eafd6fa8 Fixed warnings for GCC -Wpedantic
omar 1037bacc4b Version number
omar 89a412690c Added comment on return value of Begin()
omar af37fb1ee7 Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback
ocornut 9f05a2bb16 Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin)
ocornut 48a944813c Moved UserData
ocornut 1d9a4748de Added a UserData void *pointer so that the callback functions can access user state
"Just in case a project has adverse reactions to adding globals or
statics in their own code."
ocornut ce481ec702 SetKeyboardFocusHere() allow for an offset to access sub components + comments
ocornut f1ea630dd0 SetKeyboardFocusHere() sets focus on next widget instead of previous + works on tabbing-disabled widgets
ocornut ffc8264e9d Added SetKeyboardFocusHere() to set focus from code. Fixed tabbing through tab-disabled fields.
ocornut 0fa3d6e25f Version number and font documentation
ocornut f898e658bb Added IO.FontFallbackGlyph (default to '?') + UTF-8 test in demo window
ocornut b86505bf2f Support for international text input in UTF-8. Added ImeSetInputScreenPosFn(). Removed text_end parameter from SetClipboardTextF
ocornut a61b92f362 Merge branch 'master' of https://github.com/ocornut/imgui
ocornut 51bbe1d961 Handle UTF-8 decoding for rendering and text size calculation
Yaroslav Bunyak bd3c53754d Fix build errors.
ocornut a1162ac001 Tab to spaces
ocornut 3cd1b8a37b Update version number in sources
ocornut 746951691a Added va_list variations of all functions taking ... parameters (from Andrea Pessino)
ocornut 8eafb373f7 Warning fixes (from Andrea Pessino)
ocornut fec4232c79 Moved IM_MALLOC/IM_FREE/etc. to IO structure members one can set at runtime.
ocornut 85672fec2e Added IsPosHoveringAnyWindow()
ocornut d5ed586d70 Added IsMouseHoveringWindow(), IsMouseHoveringAnyWindow()
ocornut d58a029285 Tweak comments following feedbacks.
ocornut 05a42ba3a6 Added IO.FontBaseScale for global rescale. Renamed SetFontScale to SetWindowFontScale
ocornut 4ea2af7ea5 Fixed wrong array size in header file (apessino)
ocornut 24028911e3 Added version number in sources
ocornut 62d233aaab Added extra_flags parameters to InputInt(), InputFloat(). Used in example code. Commented out broken ImGuiInputTextFlags_AlignCenter.
Thomas Buck 7439df0ba1 Added ImGuiInputTextFlags_EnterReturnsTrue
ocornut 91059da1a5 Added more comments in the code.
ocornut c07ab1b56a Minor tweaks to "Memory override" pull request
Sepehr Taghdisian 25080d53e5 Memory override
ocornut 3b339efeb2 Added IO.FontYOffset. Added asserts.
ocornut 8fc50f5ed3 Remove IO.FontHeight, cached automatically. Added assertions.
ocornut dd5d251273 Added SetCursorPosX, SetCursorPosY shortcuts
ocornut 2fb63b6068 Checkbox() return true when pressed
ocornut 7adad71042 Moved IMGUI_FONT_TEX_UV_FOR_WHITE define to a variable so font can be changed at runtime
ocornut 88c33ecc29 Fixes to allow clean 1-pixel thick lines in more use cases. PixelCenterOffset not the same as previously!
ocornut d17a586738 Fixed ImGuiTextFilter triming of leading/trailing blanks. Documented "Filtering" section of demo better.
ocornut 5864c45fe3 Fix type conversion compiler warnings (from dadeos)
ocornut 67f17a644c Converted all Tabs to Spaces
Argh
ocornut e807d97089 Exposed CalcTextSize(), GetCursorScreenPos() for more advanced fiddling
ocornut 42d4b4be6a Converted all Tabs to Spaces (git diff -w shows an empty diff)
ocornut 76a39ad224 Added global Alpha in ImGuiStyle + commented ImGuiStyle fields in .h
Sepehr Taghdisian aa7fc37b37 removed malloc/free proxy fwd declares
Sepehr Taghdisian c2cb727ac9 memory override attempt
Sepehr Taghdisian 47fd8431c1 minor fixes
ocornut 926f7bfcc5 Added InputFloat4(), SliderFloat4() helpers.
ocornut 931a4c5b49 Renamed ImVector<> members.
Sepehr Taghdisian 5240013c90 merge with upstream
Sepehr Taghdisian 1956703c42 First attempt at memory management
ocornut ade21a1ad5 PlotLines(), PlotHistogram(): added a stride parameter.
ocornut fa0aa5ace6 Added storage for up to 5 mouse buttons for convenience (even though ImGui itself only uses 1)
ocornut 6267905a17 Added BeginTooltip()/EndTooltip() helpers to create tooltips with custom widgets
ocornut 2bc6346b48 Added TextColored() helper. Changed some parameters to const references (still allows implicit casting)
ocornut a830037eab Default "local only" clipboard handler on non-Windows platforms
ocornut 309ff44579 Undo IsHovered > IsItemHovered, shorter name wins
ocornut f30d23a502 Tweaks, more consistent #define names
ocornut a905505cca Added GetItemBoxMin(),GetItemBoxMax(), renamed IsHovered()-->IsItemHovered()
ocornut 9a426faf4f Added InputFloat2(), SliderFloat2()
Dale Kim c52a54ef43 Fix for gcc type qualifier warnings.
With -Wall -Wextra -Werror, it is not possible to compile against
imgui.h due to const correctness violation in ImVector.
ocornut ddc7f8b0b0 Simplified ImDrawList system (samples are 20 lines shorter) + merged title bar draw bar.
ocornut 2573ffb6fc Fixed warnings for more stringent compilation settings. Added various small helpers.
ocornut 150ad95bd6 Missing assert + comments
ocornut ab8561e6fc Tweaked checkbox/radio default hover color to be less distracting. Added GetItemWidth(). Added text filter to style editor.
Mirolyub Hristov 28df6f39d9 Added ImGuiCol_CheckHovered to show hovered checkboxes and radio buttons
ocornut 86d2c9d232 Commented samples and shuffled bits of the initialisation based on user's feedback.
ocornut 8ab2942716 Added PixelCenterOffset for OpenGL/DirectX compatibility.
ocornut dbd777232a Initial release