Commit Graph

777 Commits

Author SHA1 Message Date
ocornut
129339adb0 Removed 'Accessed' flag from ImGuiWindow so GetCurrentWindow() compiles to a simpler accessor 2015-03-19 15:03:10 +00:00
ocornut
11025b3160 Implicit "Debug" window hide itself based on cursor extend instead of the 'Accessed' flag. 2015-03-19 15:01:07 +00:00
ocornut
d953f8d99a ShowTestWindow: Graph checkbox under the label, also demo using BeginGroup/EndGroup() 2015-03-19 14:49:58 +00:00
ocornut
2f0fb2bc34 IsItemhovered() include label and behave consistently (#145) 2015-03-19 14:48:36 +00:00
ocornut
314b87dfaf InputFloat(): fixed label alignment if total widget width forcefully bigger than space available 2015-03-19 14:15:51 +00:00
Josh Simmons
6425b8c1cf Remove spurious assert
Remove nop assert that causes warnings on Clang.
2015-03-19 22:42:17 +11:00
ocornut
13caf21018 Use fabs() instead of abs() to ensure we use floating point. #164 2015-03-19 09:06:34 +00:00
ocornut
7a2da7cd02 Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens) 2015-03-18 22:35:51 +00:00
ocornut
62e8661a37 Fixed assignment order in Begin() making auto-fit size effectively lag by one frame
Also disabling "clamp into view" while windows are auto-fitting
2015-03-18 22:35:50 +00:00
ocornut
d45d1d1bca Documentation tweaks and fixes 2015-03-18 19:00:03 +00:00
ocornut
ed0f0dbe87 ImDrawList::AddText() takes a const ImFont* 2015-03-18 14:58:17 +00:00
ocornut
bc88ed0cb9 Fixed bounding measurement of empty groups (fix #162) 2015-03-18 13:21:32 +00:00
ocornut
e14c7e5510 ShowTestWindow(): Added simple dragging widget example. 2015-03-18 13:15:11 +00:00
ocornut
dcaafffe0e Added CalcItemRectClosestPoint() helper. 2015-03-18 13:07:37 +00:00
ocornut
9f1b407def ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper. 2015-03-18 12:54:44 +00:00
ocornut
7d26e85b05 IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly(). 2015-03-18 12:10:26 +00:00
ocornut
e10d648a28 Added ImGui::GetItemActiveDragDelta() helpers for drag operations 2015-03-18 10:41:46 +00:00
ocornut
215b0065e3 Version number 1.37 WIP 2015-03-18 10:24:56 +00:00
ocornut
7665b8e5e7 Version number 2015-03-18 09:39:38 +00:00
ocornut
d8026e4d84 Added VSliderInt() 2015-03-18 09:39:09 +00:00
ocornut
2a9a2918f8 ShowTestWindow(): more examples of SameLine() usage 2015-03-18 00:07:21 +00:00
ocornut
9c489a081c ShowTestWindow(): added vertical sliders examples, tweaks. 2015-03-17 23:58:22 +00:00
ocornut
be83c07957 Changed mentions of 'box' to be 'rect' 2015-03-17 23:41:20 +00:00
ocornut
7e6112bf26 Changed remaining mentions of 'aabb' to be 'rect' 2015-03-17 23:37:17 +00:00
ocornut
302316c6cf Renamed internal type ImGuiAabb to ImRect 2015-03-17 23:35:12 +00:00
ocornut
7e297945c3 Added BeginGroup() / EndGroup() layout tools (#160) 2015-03-17 23:28:57 +00:00
ocornut
da4bfe3289 Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering 2015-03-17 22:36:54 +00:00
ocornut
2e63bf1d16 Button() doesn't add frame padding an explicit size 2015-03-17 22:27:00 +00:00
ocornut
30bc952ac3 Maintaining DC.CursorMaxPos instead of SizeContentsCurrent, simpler, faster and easier to understand. 2015-03-17 22:03:02 +00:00
ocornut
fd7f50d269 Various fixes related to vertical alignment of text after widget of various sizes. Added demos. Toward #160
Also fixed LabelText() height.
2015-03-17 20:17:53 +00:00
ocornut
3bd5597cee Moved text vertical centering out of ItemSize() for the moment, in TextUnformatted() it's only user 2015-03-17 17:17:00 +00:00
ocornut
bbaf7e2eee Internal tweaks 2015-03-17 16:40:47 +00:00
ocornut
fe2809fecc Changed default Border and Column border colors to be most subtle, less MS-DOS 2015-03-17 16:16:15 +00:00
ocornut
7e00a41f1b Speculative warning fix 2015-03-16 18:04:51 +00:00
ocornut
cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable 2015-03-16 11:53:36 +00:00
ocornut
f4970d0e00 Moved static buffers into state
No recursion in any of those functions. Tho keeping a lock api may be
preferable?
2015-03-16 09:54:28 +00:00
ocornut
733eedc477 Moved static buffer into state 2015-03-16 09:45:32 +00:00
ocornut
d08ce58876 TreeNodeV() early out if SkipItems is set (avoid formatting string only to be discarded later) 2015-03-16 00:46:03 +00:00
ocornut
0fc9168439 Added InputInt2(), InputInt3(), InputInt4() 2015-03-15 11:30:00 +00:00
ocornut
9c6c8a1ab9 ShowTestWindow() using Unindent() / Indent() instead of an explicit TreePop 2015-03-15 11:21:59 +00:00
ocornut
44826972c0 Added Indent(), Unindent() 2015-03-15 11:19:10 +00:00
ocornut
edde703f8f Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing 2015-03-15 11:10:48 +00:00
ocornut
304d19a0d8 ShowTestWindow() added multi-components sliders in a sub-node
+ right align all widgets
2015-03-15 11:03:55 +00:00
ocornut
b443c7ebe9 Tweak VSliderFloat()
Not really happy about them
2015-03-15 10:38:19 +00:00
ocornut
1ac4f33736 Added VSliderFloat() 2015-03-15 01:58:14 +00:00
ocornut
7019cb10f7 "behaviour" -> "behavior" to behave like the greatest number 2015-03-15 01:48:59 +00:00
ocornut
c1547dd79e Internal SliderBehaviour() function now supports vertical sliders 2015-03-15 01:47:12 +00:00
ocornut
ce8150ce69 Slider fix hovering bounding test excluding padding between outer frame and grab 2015-03-15 01:36:29 +00:00
ocornut
6da83cd5b7 Plot: size provided to PlotHistogram(), PlotLines() include the padding (sorry users). 2015-03-15 01:27:37 +00:00
ocornut
98eeeab025 Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar() 2015-03-15 01:23:56 +00:00
ocornut
1ef789bb68 Slider code tweaks, split into a SliderBehaviour() function 2015-03-14 23:55:07 +00:00
ocornut
ce87c69c38 Passing ImGuiID by copy (32-bits) 2015-03-14 23:44:32 +00:00
ocornut
93befadc0b Slider code tweaks 2015-03-14 23:33:12 +00:00
ocornut
60591dd7c6 Fixed warning and split bit of SliderFloat() into a private ParseFormat() function 2015-03-14 10:30:07 +00:00
ocornut
72855becab Slider code syntax tweaks 2015-03-14 09:36:15 +00:00
ocornut
eff466d77d Fixed parsing of decimal precision back from format string when using %% 2015-03-13 13:38:58 +00:00
ocornut
110d96034b SliderFloat() fast-path when power=1.0f (no powf() calls) also makes code easier to read 2015-03-13 13:28:30 +00:00
ocornut
aaca73de15 Refactor SliderFloat() internals into a helper SliderFloatAsInputText() + some comments 2015-03-13 13:23:03 +00:00
ocornut
4d78c5c9ab Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters) 2015-03-13 13:15:01 +00:00
ocornut
ceb4da2038 Comments 2015-03-13 13:04:10 +00:00
ocornut
55093ea8fe Separator() logs itself as text 2015-03-13 12:44:04 +00:00
ocornut
153454a0fb Example console keeps focus on input box at all times 2015-03-13 12:28:23 +00:00
ocornut
1c1a55f6b1 Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused() 2015-03-13 12:25:43 +00:00
ocornut
e2734d23ef Child window don't take focus when they first appear (focus left to parent) 2015-03-13 11:16:11 +00:00
ocornut
0911526424 Added io.KeyAlt + support in examples apps
Currently unused but supported by sample so that more people will have
it set up when menus needs them
2015-03-13 09:49:38 +00:00
ocornut
58dc3f97c5 WIP marker in uppercase.. (#127) 2015-03-11 16:45:58 +00:00
ocornut
5d1c381509 Update version number, added IMGUI_VERSION, ImGui::GetVersion() (#127) 2015-03-11 16:44:54 +00:00
ocornut
4b1a18c2c9 Fixed more warnings from @bkaradzic 2015-03-09 18:36:03 +00:00
ocornut
dac9266f6f Fixed warnings 2015-03-09 18:26:48 +00:00
ocornut
d440a13b7e Version number 2015-03-09 17:30:22 +00:00
ocornut
91b4b8a0fc InputText() handles buffer limit correctly for multi-byte UTF-8 characters (fix #158)
We now maintain the buffer len for both UTF-8 and wchar
2015-03-08 20:21:19 +00:00
ocornut
6cd3ed58ce Fixed UTF-8 decoding errors leading into infnite loops (#158) 2015-03-08 17:55:56 +00:00
ocornut
0eeb6228b9 Default clipboard handlers for Windows handle UTF-8 (the glfw ones already did that) 2015-03-08 17:23:24 +00:00
ocornut
6e12d31417 Scrollbar: moved from Begin() into its own Scrollbar() function + tidying up 2015-03-08 16:37:03 +00:00
ocornut
f021080851 Scrollbar: Clicking inside the grab box doesn't modify scroll. Subsequent movement always relative. (#150).
Big change, rather thoroughly tested but hope I didn't break something.
2015-03-08 16:24:11 +00:00
ocornut
32312e538e Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing. 2015-03-08 15:03:55 +00:00
ocornut
afc23a5617 Tidying up & Chinese glyph range includes missing punctuation. 2015-03-08 13:28:44 +00:00
ocornut
79ddddd910 Merge branch 'master' of https://github.com/ocornut/imgui 2015-03-08 13:26:14 +00:00
Usagi Ito
c9bfd71e1a Fix the Japanese glyph range; include Punctuations
ref. #156 https://github.com/ocornut/imgui/issues/156
2015-03-08 22:23:52 +09:00
ocornut
a579d6f521 Scrollbar tidying up variable names 2015-03-08 12:39:50 +00:00
ocornut
d251204564 ShowTestWindow: fixed "undo" button of custom rendering applet + default size 2015-03-08 12:09:57 +00:00
ocornut
2af8e0238c Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150) 2015-03-08 12:04:38 +00:00
ocornut
a5daea9408 Added style.GrabSizeMin 2015-03-08 11:43:57 +00:00
ocornut
849c72c5c3 Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h 2015-03-08 11:32:39 +00:00
ocornut
ede45389f4 Scrollbar grab have a minimum size (mentioned in #150) 2015-03-08 11:24:02 +00:00
ocornut
e843539aab ShowTestWindow: example apps showing even if main window is collaposed. 2015-03-08 10:38:13 +00:00
ocornut
92c35e2772 Rename ImCrc32() -> ImHash() 2015-03-07 23:53:03 +00:00
ocornut
a691a245b7 GetID() doesn't need to account for empty IDStack 2015-03-07 23:52:26 +00:00
ocornut
62c900606d Fixed .ini saving for windows using ### marker. FindWindowSettings() uses ID compares (#107) 2015-03-07 23:35:36 +00:00
ocornut
f9473b807b Fixed comments 2015-03-07 22:49:16 +00:00
ocornut
3c225bbf88 Fixed typo in comments 2015-03-07 22:24:45 +00:00
ocornut
45a35c24c8 ShowTestWindow(): Added "Manipulating Window Title" example. 2015-03-07 22:20:34 +00:00
ocornut
a8c58c7a35 Minor tweaks. 2015-03-07 22:01:06 +00:00
ocornut
fbbde3a7c0 Updated documentation, better FAQ on ids and usage of "##" and "###" (#107) 2015-03-07 21:54:46 +00:00
ocornut
81a742bf54 Added "###" syntax to specify label that isn't part of the hashed ID (#107) 2015-03-07 21:53:33 +00:00
ocornut
3cac434737 Minor FindTextDisplayEnd() optimisation 2015-03-07 19:36:18 +00:00
ocornut
e01500f046 Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154 2015-03-07 12:18:01 +00:00
ocornut
6db6c0c8c0 Collapse triangle uses text color (not border color) 2015-03-07 00:35:47 +00:00
ocornut
1f272785f1 ShowTestWindow() minor tweak 2015-03-06 22:43:42 +00:00
ocornut
4ab2db73e5 Fixed ListBox() label not included in declared size (fix #151), fixed ListBoxHeader() incorrect handling of SkipItems, Added Exemple 2015-03-06 22:40:21 +00:00
ocornut
eaab61f08b Fixed using IsItemHovered() after EndChild() (#151) 2015-03-06 22:05:01 +00:00
ocornut
9c486ce4f4 Minor tidying up (more consistently using 'label_size' as a variable name) 2015-03-06 21:58:12 +00:00
ocornut
bf88d6a329 Minor tweak 2015-03-06 21:52:48 +00:00
ocornut
be9fe9489c Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP
Fixes pressing Enter in IME being caught by application right after
validating an IME input.
2015-03-06 21:39:55 +00:00
ocornut
e269125c3a Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
User need to set io.ImeWindowHandle
2015-03-06 21:11:14 +00:00
ocornut
0ffd99d319 Font: fix for fallback character width. 2015-03-06 19:17:20 +00:00
ocornut
b361c44ef4 Handle double-width space (0x3000) in various places, for Japanese users. 2015-03-06 17:51:25 +00:00
ocornut
8691c5ca42 Version number + commented failing test case 2015-03-03 15:52:56 +00:00
ocornut
cfe6dac5a3 Fixed Combo() label not included in declared size (fix #149, relate to #145) 2015-03-02 16:04:36 +00:00
ocornut
f4458f7571 Version number 2015-03-02 10:10:46 +00:00
ocornut
0faf0e6948 FindWindowByName() comparing hashes. 2015-03-02 10:04:35 +00:00
Dale Kim
85c71170af Defined bool ImGui::GetWindowCollapsed(). 2015-02-28 14:47:59 -06:00
ocornut
f18febca11 window->RootWindow persist across frames. Fix calling SetWindowFocus(const char* name) on a child window (last fix for #147) 2015-02-28 10:29:00 +00:00
ocornut
4535644fcb Clicking on empty space in a child window set keyboard focus on the child window and move parent to front (#147) 2015-02-28 10:25:04 +00:00
ocornut
9b6fa29022 Clicking on a widget in a child window focus the parent window (#147)
However SetWindowFocus() called on a child window prior to calling
Begin() on said child won;'t work yet.
2015-02-28 09:54:14 +00:00
ocornut
6fecf90e32 Unused variables fixes. 2015-02-27 11:01:34 +00:00
ocornut
40b04a3701 Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once 2015-02-27 09:51:11 +00:00
ocornut
2177b11682 Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode() 2015-02-27 09:38:22 +00:00
ocornut
d369e6b333 Fix 2015-02-27 09:13:23 +00:00
ocornut
ebe363c951 Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name. 2015-02-27 09:07:25 +00:00
ocornut
6d89285f59 Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() (#146) 2015-02-27 09:01:12 +00:00
ocornut
037ec09ffe Fixed unpackaging of Japanese glyphs ranges 2015-02-26 19:06:54 +00:00
ocornut
168a811d11 Added codepoint U+3000 (Ideographic space) and Katakana Phonetic Extensions to GetGlyphRangesChinese/GetGlyphRangesJapanese 2015-02-26 19:00:39 +00:00
ocornut
441679d9d4 Fixed GetGlyphRangesJapanese() actually missing Katakanas glyphs. 2015-02-26 18:51:51 +00:00
ocornut
8bcf2f25f2 Fixed IsItemHovered() behaving differently on Combo() (pointed out by #145) 2015-02-25 12:28:28 +00:00
ocornut
3220471237 ColumnOffsets honor SetStateStorage() modifications 2015-02-24 23:29:15 +00:00
ocornut
c2a68bb413 Made some internal parameters names more consistent 2015-02-23 21:02:04 +00:00
ocornut
c51be42f28 Added Bullet() + usage examples 2015-02-23 20:59:22 +00:00
ocornut
0df8ff6931 Version number 2015-02-23 20:52:33 +00:00
Dale Kim
72d10d3baa Fix SetColumnOffset() subtracting a bool value instead of scrollbar width. 2015-02-23 13:36:40 -06:00
ocornut
e022e5cff6 Version number 1.33 2015-02-22 18:16:25 +00:00
ocornut
cb3c1da77a GetColumnOffset() / SetColumnOffset() fixes. (cf #125)
Actually ignore window padding, and don't subtract
window->DC.ColumnsStartX like older version did.
2015-02-22 17:02:17 +00:00
ocornut
18a9c799aa Tweaking Columns() examples. 2015-02-22 16:45:55 +00:00
ocornut
358d41ba8e GetColumnOffset() / SetColumnOffset() takes account of window padding properly (cf. #125) 2015-02-22 16:27:34 +00:00
ocornut
b9457a2c02 Reworked Columns() examples. 2015-02-22 16:26:37 +00:00
ocornut
5b59f228ed Separator() within column correctly vertical offset all columns content (pointed out in #125) 2015-02-22 14:43:52 +00:00
ocornut
2e9dea0619 Removed extraneous (1,1) padding on child window (pointed out in #125) 2015-02-22 14:34:34 +00:00
ocornut
bab81318a9 Comments and changed ImVec2 parameters to const ImVec2& 2015-02-22 12:38:46 +00:00
ocornut
4229b7e60b Fix hovering of child window extending past their parent not taking account of parent clipping rectangle (Fix #137) 2015-02-22 12:05:38 +00:00
ocornut
835a46effb Comments 2015-02-21 16:50:34 +00:00
ocornut
00e281bef1 Version number 2015-02-21 16:39:21 +00:00
ocornut
0a1e67a787 InputText: cursor/selection/undo stack persist when using other widgets and getting back to same (#134)
Using SetKeyboardFocusHere() in particular on last used text edit revive
the cursor/selection.
2015-02-21 16:30:40 +00:00
ocornut
242a52abba InputText: minor tidying up. 2015-02-21 16:05:59 +00:00
ocornut
2f9ef13be3 Comments 2015-02-21 13:36:24 +00:00
ocornut
185744e697 Having a InputText() active doesn't steal mouse inputs (relate to #134) 2015-02-21 12:49:51 +00:00
ocornut
87a3522eb2 Clearing ImGuiState, may switch back to memset(0) but that would put a requirement on user defined ImVector<> to be zero-fill compat 2015-02-21 11:49:12 +00:00
ocornut
4deeaea93c BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content. 2015-02-21 10:30:05 +00:00
ocornut
8f75cffc09 Columns: doesn't incorrectly bail out when SkipItems is set (fix #136) 2015-02-21 10:27:13 +00:00
ocornut
0e159aa22e BeginChild() variant goes after the main one 2015-02-21 10:10:21 +00:00
ocornut
2ae0e667d0 Child window explicitly inherit collapse state from parent. 2015-02-21 10:02:32 +00:00
ocornut
f2752584e2 Added IsAnyItemActive() 2015-02-18 17:17:06 +00:00
ocornut
c1f20f03c5 ImGuiTextFilter() can take a default filter string 2015-02-15 13:50:04 +00:00
ocornut
d58ded3acb Sliders: value is clipped inside the frame when resizing sliders to be small. 2015-02-13 10:37:03 +00:00
ocornut
9542f52182 InputText: size for allowed input size smaller than necessary by 1 byte. 2015-02-13 09:39:50 +00:00
ocornut
1eef869669 Fix ImFont::BuildLookupTable() potential dangling pointer dereference (fix #131) 2015-02-13 08:56:06 +00:00
ocornut
941ef993d9 ImGuITextFilter::Draw() use regular width call. 2015-02-12 19:34:14 +00:00
ocornut
dbdbaec3eb Version number + comment 2015-02-11 18:34:55 +00:00
ocornut
cb0a4db048 Calculate frame-rate for the user, as a purely luxurious feature
..and to reduce sample code size a little.
2015-02-11 18:28:17 +00:00
ocornut
d65e051a07 Minor formatting tweaks, comments 2015-02-11 18:14:39 +00:00
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
183a27fd70 CalcTextSize*() more optimisation, fast-path for ascii. 2015-02-11 12:31:04 +00:00
ocornut
ea94835834 CalcTextSize*() tweaks. ImTextCharFromUtf8() return 1 for a zero character now. 2015-02-11 12:23:38 +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
c73d9cfebb Columns offsets cached to avoid repeated binary search. 2015-02-11 11:50:24 +00:00
ocornut
6347179bb0 Added ListBox() (#129)
Along with ListBoxHeader(), ListBoxFooter() helpers.
2015-02-11 00:21:27 +00:00
ocornut
16925525c6 Selectable: fixed text clipping. 2015-02-10 22:56:28 +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
5d31430785 Combo() uses Selectable() 2015-02-10 19:51:52 +00:00
ocornut
e5752f54b0 Selectable() variant: fixed missed return value 2015-02-10 19:47:35 +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
220d920581 Internal ButtonBehaviour() supports a pressed_on_click mode (unused yet) + Renamed internal Combo*getters to Items*getters 2015-02-10 17:45:45 +00:00
ocornut
46dfbb5fa8 Tweak default ImGuiCol_HeaderActive to be less bright 2015-02-10 17:43:58 +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
4cb236fe46 ShowTestWindow() demonstrate tree nodes within columns. 2015-02-10 12:37:52 +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
f387c3f22f Combo box always appear above other child windows of a same parent 2015-02-08 17:21:51 +00:00
ocornut
b5e7648e24 Title bar text uses cpu-clipping + comments 2015-02-08 16:39:34 +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
cc340e0b81 Split RenderText into RenderTextWrapped for internal uses
Different text functions with different features (usually orthogonal set
of features)
2015-02-08 15:57:06 +00:00
ocornut
b8cd080cdb LabelText: value is properly clipped (fixes #23) 2015-02-08 15:46:23 +00:00
ocornut
93917e76a6 Combo: value label is properly clipped inside the closed combo frame 2015-02-08 15:39:40 +00:00
ocornut
9596a2b4f1 ShowExampleAppLongText() demonstrate manual clipping. 2015-02-08 14:32:58 +00:00
ocornut
d5d8dedadd Calling SetCursorPos() automatically extends the contents size 2015-02-08 14:20:00 +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
ocornut
c116dad304 Fixed holdng scrollbar creating a small feedback loop with calculation of contents size 2015-02-08 13:29:55 +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
4e33787c2f Comments 2015-02-04 09:01:00 +01:00
ocornut
311c0ca9e5 If mouse was first clicked outside of ImGui bounds we also cancel out hovering. 2015-02-03 10:35:43 +00: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
ocornut
4169d2c8db Fixed more pedantic warnings 2015-02-02 09:06:51 +00:00
ocornut
0a6577a6df Fixed warnings 2015-02-02 08:51:45 +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
85763150e8 Fixed / removed unncessary allocation in Render() 2015-02-01 14:42:09 +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
6777145853 InputText: Filtering private Unicode range 0xE000-0xF8FF seems like glfw on OSX uses those? 2015-02-01 14:08:37 +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
1be4604027 Fixed pointer dereferencing error from merge 2015-01-31 20:35:42 -08:00
Jim Tilander
e9ff2f3d24 Merge branch 'master' of https://github.com/ocornut/imgui 2015-01-31 20:31:41 -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
49569a903c Shortened text 2015-01-31 23:55:47 +00:00
ocornut
2f5c754ef1 InputText: process character input before Return because they may come together (IME batch) 2015-01-31 23:51:00 +00:00
ocornut
bebd2da1f1 Wrapping g.ActiveId assignment into a function for easy breakpoint. 2015-01-31 22:57:59 +00:00
ocornut
3f6091b26b Pedantic grammar fix 2015-01-31 21:27:26 +00: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
82666cdc57 ShowTestWindow() early out if window is collapsed. Drawing the 2 columns example differently. 2015-01-31 10:20:37 +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
64679a0b03 ImFontAtlas::Build() does a sanity memset on glyph rectangles. 2015-01-29 17:44:46 +01:00
ocornut
4c4bbcb451 Examples: fixed custom rendering example canvas size. 2015-01-29 15:04:56 +01: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
962ef3924a Added extra asserts and tweaked code in Begin() 2015-01-29 14:07:20 +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
00842d18e4 Speculative GCC warning fix (again) 2015-01-24 11:30:40 +01:00
ocornut
4535f5f899 Fixed some warnings with Clang/GCC 2015-01-24 11:18:31 +01:00
ocornut
638babb0dd Examples: added simple drawing app example for using ImDrawList and custom drawing 2015-01-23 01:38:04 +01:00
ocornut
32b8ad7381 Fixed mouse aiming within InputText() - broken during 01/18 merge 2015-01-23 00:02:44 +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
f1ccd32cb1 stb_truetype: implementation is now static + submitted PR to origin. 2015-01-21 23:45:21 +01:00
ocornut
26174cba85 Added InvisibleButton() 2015-01-21 23:03:25 +01:00
ocornut
dbffbacaf6 Added IMGUI_DISABLE_STB_***_IMPLEMENTATION 2015-01-21 11:59:11 +01:00
ocornut
26f93e6660 IMGUI_STB_NAMESPACE define Stb stuff in a namespace (trying stuff to reduce problems with multiple implementations) 2015-01-21 11:54:23 +01:00
ocornut
9524d76fe8 Documentation 2015-01-20 22:37:18 +01:00
ocornut
942e1ca811 Notes, todo items 2015-01-20 10:37:30 +01:00
ocornut
b0eac255ca Warning fixes for 64-bit architectures 2015-01-20 01:01:25 +01:00
ocornut
56ac857cac Added stub for obsolete GetDefaultFontData() to help the user upgrading 2015-01-18 15:12:41 +00:00
ocornut
7e2305eb36 Comments 2015-01-18 12:22:17 +00:00
ocornut
bfe894406d ImFontAtlas: some more optimisations / cleanup. 2015-01-18 12:12:16 +00:00
ocornut
e685e49781 ImFontAtlas: reduced number of temporary allocation when building lots of input ranges 2015-01-18 11:55:58 +00:00
ocornut
8386e4fb7e Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure. 2015-01-18 11:36:23 +00:00
ocornut
ca81fd3a34 Removing the binary_to_c() comment, link to license for ProggyClean 2015-01-18 11:19:11 +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
37dcf58e2f Fixed clang warnings 2015-01-17 23:13:54 +00:00
ocornut
0dad59b032 Merge remote-tracking branch 'origin/master' into 2015-01-truetype 2015-01-17 22:57:35 +00:00
ocornut
e666920784 ImFont: small optimization to our (incorrect) handling of TAB
TAB is still handled as 4-spaces width (which is incorrect)
But CalcTextSize is simplified.
2015-01-17 22:53:54 +00:00
ocornut
5ad9a2f119 Comments on new API 2015-01-17 22:38:10 +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
a3e368a477 Fixed alignment of ColorEdit4() label 2015-01-17 17:19:07 +00:00
ocornut
cb9a3235be Removed PixelCenterOffset, uncesssary 2015-01-17 17:17:18 +00:00
ocornut
ad92018bc0 Fixed lower-right rounded triangle rendering precision.
PixelCenterOffset is handled very inconsistently, needs to be fixed.
2015-01-17 17:03:22 +00:00
ocornut
014f88b1fc Font fixes for horizontal centering within frames 2015-01-17 15:44:25 +00:00
ocornut
edee014ab8 ImDrawList merging commands with same texture 2015-01-17 14:13:08 +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
79d1a9d941 Commenting asserts. 2015-01-17 12:27:27 +00:00
ocornut
97fcee0d0d Fix usage of multiple Begin/End pair for the same window, handling of move in End() was stealing Active ID 2015-01-16 10:55:49 +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
f61e8e6e26 Tooltip always auto-resize. May look into max-over-xx-seconds policy later. 2015-01-15 18:00:10 +00:00
ocornut
2082487366 Allow SetNextWindowPos() to affect tooltips. 2015-01-15 17:47:53 +00:00
ocornut
584c7ffac8 Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos) 2015-01-15 14:41:22 +00:00
ocornut
2d7a2310fd Collapsing header also honor FrameRounding 2015-01-15 10:29:51 +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
3c8f010c29 Fixed TooltipBg color not being honored by tooltip + no minimum tooltip size. 2015-01-14 22:10:48 +00:00
ocornut
188165a063 Fix stupid crash on fallback glyph handling (ttf branch) 2015-01-14 21:59:39 +00:00
ocornut
08b50cce12 TODO list update 2015-01-14 21:58:30 +00:00
ocornut
04eca0c375 TODO list update 2015-01-14 13:43:41 +00:00
ocornut
a372d67f47 Improve memory reserve policy for Clipboard/ImGuiBuffer 2015-01-14 13:04:33 +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
5322224881 Warning fixes for llvm windows 64-bits 2015-01-13 23:19:11 +00:00
ocornut
f0b493c217 Fixed style.WindowMinSize not honored properly. 2015-01-13 23:05:20 +00:00
ocornut
f061884dea Typos and comments 2015-01-11 22:22:46 +00:00
ocornut
0f89e06152 Fixed temporary glyph rectangle allocation using size much too big. 2015-01-11 22:03:03 +00:00
ocornut
e5d0d8334f Tweak default texture width for large amount of characters. 2015-01-11 21:55:21 +00:00
ocornut
d27b295f4c Documentation on new font / texture get api 2015-01-11 21:24:12 +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
a09f426b89 TAB to spaces 2015-01-11 17:56:43 +00:00
ocornut
40f7b67ef1 ImDrawList::AddText() allows changing font 2015-01-11 16:46:39 +00:00
ocornut
cc79b85c28 Added first-pass of Image() based on #73 + demo 2015-01-11 16:30:39 +00:00
ocornut
c1fe6fe14d Fixed GetStyleColName() not matching the enum strings for 3 values (#111) 2015-01-09 17:19:24 +00:00
ocornut
5dff478dc0 Build fix for GCC/Clang, cannot foward declare a static array? 2015-01-09 09:00:53 +00:00
ocornut
2757e3573a Comments 2015-01-08 23:53:07 +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
4260195159 Revert "Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters"
Correct but cause problems because many people don't have 1 BPP PNG loaders

This reverts commit 98a38e24ab.
2015-01-07 18:59:44 +00:00
ocornut
26fdf1655c Fixed leak on shutdown (fixes #110) + possible uninitialized member. 2015-01-07 14:55:35 +00:00
ocornut
98a38e24ab Reexported proggy_clean_13 in a 256x64 texture (instead of 256x128) and documented exact export parameters 2015-01-05 11:13:02 +00:00