Commit Graph

772 Commits

Author SHA1 Message Date
ocornut 56bf9ea067 Added comment on MemFreeFn as suggested by #119 2015-02-01 14:27:22 +00:00
ocornut e636e0d2aa Warning fixes (fix #118) 2015-02-01 09:33:51 +00:00
Jim Tilander 3478e3a708 Enabled us to create the internal state on client side allocated memory, e.g. a heap 2015-01-31 21:55:19 -08:00
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) 2015-01-31 20:28:24 -08:00
Jim Tilander 98e71afa72 Removed the dependency on realloc functionality 2015-01-31 16:17:39 -08:00
ocornut a548c9b0d5 Version change 2015-01-31 19:10:04 +00:00
ocornut ca10c49e27 Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor 2015-01-31 18:55:05 +00:00
ocornut 68bad703ee ImColor::HSV() helper + color buttons demo 2015-01-31 17:15:07 +00:00
ocornut 8d1583d611 Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha. 2015-01-31 16:44:55 +00:00
ocornut cb3b69c879 Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32 2015-01-31 16:36:12 +00:00
ocornut 3cf47988b0 Added ImageButton() using regular framing + override framing size (#73) 2015-01-31 16:21:12 +00:00
ocornut 2ecc285919 ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget)) 2015-01-31 15:24:55 +00:00
ocornut 4437293b79 Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments 2015-01-31 09:51:25 +00:00
ocornut 27161d2a98 Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
+ remove duplicated "Setup outer clipping rectangle" block in Begin))
2015-01-29 14:20:25 +01:00
ocornut 07f69966f8 ImDrawList::AddImage() color parameter defaults to white 2015-01-29 13:46:34 +01:00
ocornut 79042a3a3c GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef 2015-01-29 10:22:32 +01:00
Daniel Collin c9c41c3874 Added Set/GetVoidPtr in ImGuiStorage 2015-01-28 21:31:22 +01:00
ocornut 7530f3c985 Added IsItemActive() - replace IsItemFocused()
ClipAdvance() --> ItemAdd() - nb: return value is inverted
2015-01-22 23:54:05 +01:00
ocornut 70188c5623 Added comments 2015-01-22 11:03:24 +01:00
ocornut 26174cba85 Added InvisibleButton() 2015-01-21 23:03:25 +01:00
ocornut 56ac857cac Added stub for obsolete GetDefaultFontData() to help the user upgrading 2015-01-18 15:12:41 +00:00
ocornut 1916a0c78c Renamed FontAtlas to Fonts. Further cleanup/comments. 2015-01-18 10:46:49 +00:00
ocornut 1f8d209202 Fixed more clang warnings + AddFontFromMemoryTTF() not honoring font_no parameter 2015-01-17 23:21:06 +00:00
ocornut 2c31599bcc ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30 2015-01-17 22:15:29 +00:00
ocornut cb9a3235be Removed PixelCenterOffset, uncesssary 2015-01-17 17:17:18 +00:00
ocornut 014f88b1fc Font fixes for horizontal centering within frames 2015-01-17 15:44:25 +00:00
ocornut 3e30ad3802 PushFont/PopFont changes texture at high-level in current draw list - faster 2015-01-17 14:00:43 +00:00
ocornut 7ebd7ef9ac Added PushFont/PopFont API 2015-01-17 13:40:56 +00:00
ocornut ab8d2782c6 Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
	imgui.cpp
	imgui.h
2015-01-15 18:07:44 +00:00
ocornut 584c7ffac8 Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos) 2015-01-15 14:41:22 +00:00
ocornut 02f0dbca37 ColorEdit3: clicking on color square change edit-mode, removing color-edit mode button by default. 2015-01-15 09:49:12 +00:00
ocornut 8ba93d947c Added FrameRounding setting (default to 0 for now). 2015-01-15 09:14:44 +00:00
ocornut 3a20671802 Fixed logging to clipboard on architectures where va_list are modified by vsnprintf (fixed #112) 2015-01-14 13:01:53 +00:00
ocornut e2d8c03e1a Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
+ removed unnecessary destructor
2015-01-13 23:06:55 +00:00
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.
2015-01-11 21:06:57 +00:00
ocornut 241e8086fa Mde it optional to new() io.Font - however it stills needs to be loaded. 2015-01-11 18:27:05 +00:00
ocornut cc79b85c28 Added first-pass of Image() based on #73 + demo 2015-01-11 16:30:39 +00:00
ocornut 1a6e7f25e0 ImVector: less hoops in back() / front(), more friendly for debugger and unoptimized builds
+ fixed typos
2015-01-11 16:25:57 +00:00
ocornut f77490cb2d Cleanup extra_fonts/ folder 2015-01-08 23:49:17 +00:00
ocornut b3a208901a Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean. 2015-01-08 23:35:01 +00:00
ocornut b0ea57e518 Version number 2015-01-07 19:07:43 +00:00
Mikko Mononen 91684a428b Merge upstream 2015-01-06 19:15:41 +02:00
Mikko Mononen d9757bb583 First pass on AA rendered primitives 2015-01-06 19:05:24 +02:00
ocornut 0505995193 Very minor code/comments tweaks. 2015-01-04 22:29:53 +00:00
ocornut 22c1d7eded Renamed some color enums 2015-01-04 19:37:24 +00:00
ocornut 39373b563b Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI 2015-01-04 19:23:36 +00:00
ocornut 12225abfe2 Version number (fix) 2014-12-31 10:38:36 +00:00
ocornut f8c58fe328 Fix for Clang 2014-12-30 16:55:32 +00:00
ocornut da5227fa28 Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h 2014-12-30 15:44:19 +00:00
ocornut 2d111ccb55 crc32 on strings is performed in one pass - removed the strlen() call. 2014-12-30 15:18:21 +00:00
ocornut 691ca46978 Version number 2014-12-30 15:10:55 +00:00
ocornut 929f127d06 Added SliderInt2(), SliderInt3(), SliderInt4() for consistency 2014-12-30 11:54:04 +00:00
ocornut 036a153cf4 Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText(). 2014-12-29 20:18:52 +00:00
ocornut 886d954e3d GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing 2014-12-29 19:56:01 +00:00
ocornut 39952d2362 Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers 2014-12-29 18:17:54 +00:00
ocornut 1b25fa8169 Added LogFinish() to stop logging at an arbitrary point. 2014-12-29 18:13:41 +00:00
ocornut e2fbbe0274 Factoring bits out of Begin() into a private CreateNewWindow() funciton
(Hopefully to ease a bit the merging work for ProDBG)
2014-12-28 17:54:02 +00:00
ocornut 5b7ed5432e CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it) 2014-12-28 16:17:08 +00:00
ocornut 90351298d1 Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin(). 2014-12-22 13:29:39 +00:00
ocornut a3af51fd4e Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API 2014-12-19 12:56:00 +00:00
omar 7e868e2842 Cleanup todo list, removed 3 done items + added 1 new 2014-12-11 10:12:52 +00:00
omar 0056ccce26 Version number 2014-12-10 23:40:25 +00:00
omar e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
2014-12-10 19:22:30 +00:00
omar 3399890a84 Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app. 2014-12-10 17:13:45 +00:00
omar 2a3bff9a82 Comments 2014-12-10 16:56:11 +00:00
omar cca5f473ca Clarified comment 2014-12-08 17:18:20 +00:00
omar bdb2344db0 ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading? 2014-12-08 17:14:54 +00:00
ocornut e43cd6e97f Added IMGUI_INCLUDE_IMGUI_USER_H 2014-12-05 23:09:43 +00:00
omar 6b16424faf Comments. 2014-12-04 11:54:49 +00:00
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.
2014-12-03 18:17:10 +00:00
omar d31623061f ImVector: private -> protected 2014-12-03 11:56:40 +00:00
ocornut 7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks. 2014-11-30 16:56:35 +00:00
ocornut e835ef1d90 Fix from incorrect change left-over in a31e44b99a 2014-11-30 15:19:39 +00:00
ocornut 214c967df8 Example code: warning fix + comments. 2014-11-30 12:28:21 +00:00
omar 31654958f9 Merge pull request #92 from memononen/master
Smoother mouse wheel scrolling
2014-11-30 12:25:21 +00:00
ocornut a31e44b99a Fixed Clang -Weverything warnings + TODO list entries 2014-11-30 12:21:50 +00:00
Mikko Mononen eb789c0288 Smoother scrolling
- changed IO.MouseWheel to float, allows smoother scrolling
2014-11-30 12:20:25 +02:00
ocornut e9aead09cb Remove unneeded extra parameter from ImFont::FindGlyph() 2014-11-29 00:04:05 +00:00
ocornut e4a79e9fc8 Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale) 2014-11-29 00:02:46 +00:00
ocornut e27eddfbd2 Grammar fix + ocd alignment 2014-11-28 23:10:43 +00:00
ocornut 311a2f8328 New version of IMGUI_ONCE_UPON_A_FRAME helper macro 2014-11-28 23:08:45 +00:00
ocornut df2ad5e899 Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef 2014-11-28 22:38:41 +00:00
omar b9118750ae Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers 2014-11-26 22:16:38 +00:00
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.
2014-11-23 23:35:26 +00:00
omar 8c4fcf1359 Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first. 2014-11-21 16:29:56 +00:00
omar 5f8175abaa Version number 2014-11-21 13:40:38 +00:00
omar cf037b4769 PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar 2014-11-21 13:23:22 +00:00
ocornut 97192606a6 Fixed Tab > space 2014-11-20 15:19:55 +00:00
ocornut 2aee4419e3 Fixed compatibility with std::vector if user decide to #define ImVector 2014-11-20 08:15:21 +00:00
ocornut f3bd033b6d More fixes for ultra pedantic Clang -Weverything 2014-11-18 09:55:31 +00:00
Daniel Collin b01adf16de Fixed more Clang warnings 2014-11-17 20:37:22 +01:00
omar c6f3d0924e Default 'text_end' parameter for low-level AddText/CalcTextSizeA functions 2014-11-17 02:18:37 +09:00
ocornut 191e17eaf8 Added IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT 2014-11-15 13:18:25 +00:00
omar 4205241e86 PushTextWrapPos() defaults to 0.0 2014-11-10 10:23:06 +09:00
omar ee3355fe8e Version number 2014-11-07 17:43:00 +09:00
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.
2014-11-07 17:22:38 +09:00
omar 3a64c77826 Renamed IsHovered() to IsItemHovered() 2014-11-07 15:49:14 +09:00
omar e19f0d370a Added dummy IMGUI_API definition in front of entry-points for silly DLL action 2014-11-07 15:40:58 +09:00
omar 6c192f3221 Added GetContentRegionMax() supporting columns. Some bug fixes with using columns. 2014-11-07 15:17:04 +09:00
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.
2014-11-07 14:45:56 +09:00
ocornut 3d84858755 Made with the NoResize flag can still use auto-fitting. Added SetWindowSize(). 2014-10-26 20:07:15 +00:00
ocornut fad5e45d2c Minor tweaks 2014-10-26 19:56:57 +00:00
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. 2014-10-26 12:25:00 -07:00
ocornut e6eafd6fa8 Fixed warnings for GCC -Wpedantic 2014-10-26 15:08:28 +00:00
omar 1037bacc4b Version number 2014-10-25 11:15:28 +01:00
omar 89a412690c Added comment on return value of Begin() 2014-10-25 11:01:20 +01:00
omar af37fb1ee7 Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback 2014-10-25 11:00:24 +01:00
ocornut 9f05a2bb16 Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin) 2014-10-07 12:15:59 +01:00
ocornut 48a944813c Moved UserData 2014-10-05 09:11:02 +01:00
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."
2014-10-05 09:08:57 +01:00
ocornut ce481ec702 SetKeyboardFocusHere() allow for an offset to access sub components + comments 2014-09-30 12:31:35 +01:00
ocornut f1ea630dd0 SetKeyboardFocusHere() sets focus on next widget instead of previous + works on tabbing-disabled widgets 2014-09-30 12:22:58 +01:00
ocornut ffc8264e9d Added SetKeyboardFocusHere() to set focus from code. Fixed tabbing through tab-disabled fields. 2014-09-30 11:57:37 +01:00
ocornut 0fa3d6e25f Version number and font documentation 2014-09-26 01:20:56 +01:00
ocornut f898e658bb Added IO.FontFallbackGlyph (default to '?') + UTF-8 test in demo window 2014-09-26 01:06:27 +01:00
ocornut b86505bf2f Support for international text input in UTF-8. Added ImeSetInputScreenPosFn(). Removed text_end parameter from SetClipboardTextF 2014-09-25 14:51:06 +01:00
ocornut a61b92f362 Merge branch 'master' of https://github.com/ocornut/imgui 2014-09-25 11:30:07 +01:00
ocornut 51bbe1d961 Handle UTF-8 decoding for rendering and text size calculation 2014-09-25 11:29:59 +01:00
Yaroslav Bunyak bd3c53754d Fix build errors. 2014-09-25 01:45:54 +03:00
ocornut a1162ac001 Tab to spaces 2014-09-24 20:39:39 +01:00
ocornut 3cd1b8a37b Update version number in sources 2014-09-24 19:34:03 +01:00
ocornut 746951691a Added va_list variations of all functions taking ... parameters (from Andrea Pessino) 2014-09-24 19:27:29 +01:00
ocornut 8eafb373f7 Warning fixes (from Andrea Pessino) 2014-09-24 18:57:52 +01:00
ocornut fec4232c79 Moved IM_MALLOC/IM_FREE/etc. to IO structure members one can set at runtime. 2014-09-24 18:01:07 +01:00
ocornut 85672fec2e Added IsPosHoveringAnyWindow() 2014-09-24 15:49:15 +01:00
ocornut d5ed586d70 Added IsMouseHoveringWindow(), IsMouseHoveringAnyWindow() 2014-09-24 15:38:29 +01:00
ocornut d58a029285 Tweak comments following feedbacks. 2014-09-24 14:12:51 +01:00
ocornut 05a42ba3a6 Added IO.FontBaseScale for global rescale. Renamed SetFontScale to SetWindowFontScale 2014-09-24 14:03:42 +01:00
ocornut 4ea2af7ea5 Fixed wrong array size in header file (apessino) 2014-09-17 22:43:05 +01:00
ocornut 24028911e3 Added version number in sources 2014-09-10 12:26:12 +01:00
ocornut 62d233aaab Added extra_flags parameters to InputInt(), InputFloat(). Used in example code. Commented out broken ImGuiInputTextFlags_AlignCenter. 2014-09-08 16:50:09 +01:00
Thomas Buck 7439df0ba1 Added ImGuiInputTextFlags_EnterReturnsTrue 2014-09-08 15:48:39 +02:00
ocornut 91059da1a5 Added more comments in the code. 2014-09-02 14:35:06 +01:00
ocornut c07ab1b56a Minor tweaks to "Memory override" pull request 2014-08-31 12:02:22 +01:00
Sepehr Taghdisian 25080d53e5 Memory override #3 2014-08-31 14:58:21 +04:30
ocornut 3b339efeb2 Added IO.FontYOffset. Added asserts. 2014-08-30 20:02:10 +01:00
ocornut 8fc50f5ed3 Remove IO.FontHeight, cached automatically. Added assertions. 2014-08-30 18:43:26 +01:00
ocornut dd5d251273 Added SetCursorPosX, SetCursorPosY shortcuts 2014-08-29 13:36:31 +01:00
ocornut 2fb63b6068 Checkbox() return true when pressed 2014-08-28 17:32:03 +01:00
ocornut 7adad71042 Moved IMGUI_FONT_TEX_UV_FOR_WHITE define to a variable so font can be changed at runtime 2014-08-28 14:53:41 +01:00
ocornut 88c33ecc29 Fixes to allow clean 1-pixel thick lines in more use cases. PixelCenterOffset not the same as previously! 2014-08-28 14:52:10 +01:00
ocornut d17a586738 Fixed ImGuiTextFilter triming of leading/trailing blanks. Documented "Filtering" section of demo better. 2014-08-25 17:19:04 +01:00
ocornut 5864c45fe3 Fix type conversion compiler warnings (from dadeos) 2014-08-20 10:40:31 +01:00
ocornut 67f17a644c Converted all Tabs to Spaces
Argh
2014-08-19 12:45:34 +01:00
ocornut e807d97089 Exposed CalcTextSize(), GetCursorScreenPos() for more advanced fiddling 2014-08-19 12:39:30 +01:00
ocornut 42d4b4be6a Converted all Tabs to Spaces (git diff -w shows an empty diff) 2014-08-19 12:09:13 +01:00
ocornut 76a39ad224 Added global Alpha in ImGuiStyle + commented ImGuiStyle fields in .h 2014-08-18 13:03:02 +01:00
Sepehr Taghdisian aa7fc37b37 removed malloc/free proxy fwd declares 2014-08-18 16:19:11 +04:30
Sepehr Taghdisian c2cb727ac9 memory override attempt #2 2014-08-18 16:08:03 +04:30
Sepehr Taghdisian 47fd8431c1 minor fixes 2014-08-18 13:19:35 +04:30
ocornut 926f7bfcc5 Added InputFloat4(), SliderFloat4() helpers. 2014-08-17 14:16:10 +01:00
ocornut 931a4c5b49 Renamed ImVector<> members. 2014-08-17 13:55:27 +01:00
Sepehr Taghdisian 5240013c90 merge with upstream 2014-08-16 13:00:39 +04:30
Sepehr Taghdisian 1956703c42 First attempt at memory management 2014-08-16 12:58:29 +04:30
ocornut ade21a1ad5 PlotLines(), PlotHistogram(): added a stride parameter. 2014-08-15 17:36:54 +01:00
ocornut fa0aa5ace6 Added storage for up to 5 mouse buttons for convenience (even though ImGui itself only uses 1) 2014-08-15 16:22:03 +01:00
ocornut 6267905a17 Added BeginTooltip()/EndTooltip() helpers to create tooltips with custom widgets 2014-08-15 16:18:00 +01:00
ocornut 2bc6346b48 Added TextColored() helper. Changed some parameters to const references (still allows implicit casting) 2014-08-15 12:32:53 +01:00
ocornut a830037eab Default "local only" clipboard handler on non-Windows platforms 2014-08-14 15:03:10 +01:00
ocornut 309ff44579 Undo IsHovered > IsItemHovered, shorter name wins 2014-08-14 14:32:01 +01:00
ocornut f30d23a502 Tweaks, more consistent #define names 2014-08-14 14:31:13 +01:00
ocornut a905505cca Added GetItemBoxMin(),GetItemBoxMax(), renamed IsHovered()-->IsItemHovered() 2014-08-14 12:43:30 +01:00
ocornut 9a426faf4f Added InputFloat2(), SliderFloat2() 2014-08-13 18:46:18 +01:00
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.
2014-08-13 11:57:37 -05:00
ocornut ddc7f8b0b0 Simplified ImDrawList system (samples are 20 lines shorter) + merged title bar draw bar. 2014-08-13 11:34:08 +01:00
ocornut 2573ffb6fc Fixed warnings for more stringent compilation settings. Added various small helpers. 2014-08-12 19:57:46 +01:00
ocornut 150ad95bd6 Missing assert + comments 2014-08-12 00:36:13 +01:00
ocornut ab8561e6fc Tweaked checkbox/radio default hover color to be less distracting. Added GetItemWidth(). Added text filter to style editor. 2014-08-12 00:04:13 +01:00
Mirolyub Hristov 28df6f39d9 Added ImGuiCol_CheckHovered to show hovered checkboxes and radio buttons 2014-08-11 21:35:27 +02:00
ocornut 86d2c9d232 Commented samples and shuffled bits of the initialisation based on user's feedback. 2014-08-11 15:02:33 +01:00
ocornut 8ab2942716 Added PixelCenterOffset for OpenGL/DirectX compatibility. 2014-08-11 14:51:22 +01:00
ocornut dbd777232a Initial release 2014-08-10 21:58:11 +01:00