mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-28 00:39:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
977 Commits 9 Branches 125 Tags 225 MiB
94b7c9e307
Commit Graph

298 Commits

Author SHA1 Message Date
ocornut
a597664672 Added ImGuiInputTextFlags_CharsNoBlank stock filter. Tweak examples. 2015-02-11 18:01:32 +00:00
ocornut
2df4735904 ImGuiInputTextFlags_CallbackCharFilter can return 1 to filter character 2015-02-11 17:55:26 +00:00
ocornut
b73484a66b Added ImGuiInputTextFlags_CharsUppercase stock filter 2015-02-11 17:46:16 +00:00
ocornut
9473cd491e InputText(): added ImGuiInputTextFlags_CallbackCharFilter system for filtering/replacement. Callback now passed an "EventFlag" parameter. 2015-02-11 17:39:13 +00:00
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.
 2015-02-11 12:10:45 +00:00
ocornut
6347179bb0 Added ListBox() (#129) 
Along with ListBoxHeader(), ListBoxFooter() helpers.
 2015-02-11 00:21:27 +00:00
ocornut
c26af284db Tweaks. Combo default height_in_items is -1 at compilation time to match incoming ListSelect() behavior 2015-02-10 22:48:46 +00:00
ocornut
801ed2c472 Allow passing -0.01f to PushItemWidth() for a perfect right-side alignment + fix CalcItemWidth() 2015-02-10 21:42:21 +00:00
ocornut
e7f51172c1 BeginChildFrame() / EndChildFrame() helpers. 2015-02-10 21:21:23 +00:00
ocornut
1e9f6cce7f PushItemWidth() can take negative value to right-align items. Renamed GetItemWidth() to CalcItemWidth() 2015-02-10 21:07:26 +00:00
ocornut
8532da3f52 Added BeginChild() variant that takes an ImGuiID 2015-02-10 19:12:48 +00:00
ocornut
c6d42b1a54 Added Selectable() building block for various list boxes, combo boxes 2015-02-10 19:09:37 +00:00
ocornut
da2f5d9c48 Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility 
Upcoming features using it.
 2015-02-10 13:00:22 +00:00
ocornut
8e8cb7de3f Fixed title bar text clipping issue (fix #128) 
+ Update version number
 2015-02-09 20:32:00 +00:00
ocornut
734cf47e71 Version number 2015-02-08 17:26:24 +00:00
ocornut
c907108c23 SetNextWindowPos api before SetWindowPos api in .h + comments 2015-02-08 16:43:20 +00:00
ocornut
f84166dda9 Use cpu-side clipping instead of a new draw call for isolated label-clipped-by-frame cases. 2015-02-08 16:32:51 +00:00
ocornut
9e3f8adfac Added CalcListClipping() helper. 2015-02-08 13:44:09 +00:00
ocornut
29e0aad739 Renamed GetTextLineSpacing to GetTextLineHeightWithSpacing. Added GetCursorPosX/GetCursorPosY 2015-02-08 13:37:20 +00:00
Václav Patejdl
d135d91e27 Added tint_col parameter to ImageButton 2015-02-04 19:19:43 +01:00
ocornut
209ab823d6 Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig. 2015-02-04 09:43:11 +01:00
ocornut
e36fad65dd Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master 
Conflicts:
	imgui.cpp
 2015-02-04 09:30:03 +01:00
ocornut
c6de9502f8 Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window 2015-02-03 09:56:19 +00:00
ocornut
94c7eddb17 Comments 2015-02-02 19:50:28 +00:00
ocornut
5df28b101d Added ImGuiWindowFlags_NoCollapse flag 2015-02-02 09:49:12 +00:00
Jim Tilander
e6318abcee Merged changes from original master 2015-02-01 09:09:03 -08:00
ocornut
cc3d41dbab Version number 1.31 wip 2015-02-01 14:47:21 +00:00
ocornut
bde3f6b90d Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame() 2015-02-01 14:39:13 +00:00
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
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