1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 15:50:25 +01:00
Commit Graph

612 Commits

Author SHA1 Message Date
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