Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-23 12:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,810 Commits 13 Branches 79 Tags 86 MiB
c1983d5c3f
Commit Graph

1285 Commits

Author SHA1 Message Date
ocornut
975ef00682 Minor construction fix (-1.0 is correct "disabled" value for TextWrapPos, didn't have any incidence anyway) 2015-06-24 19:53:41 -06:00
ocornut
d171e48b20 Fixed SetNextWindowPosCenter() being processed too early for windows that are still measuring their size (for #249) 2015-06-23 15:45:34 -06:00
ocornut
5436266963 Added SetNextWindowPosCenter() (#249) 2015-06-23 15:34:44 -06:00
ocornut
bcbf53857c BeginPopupModal() default to NoCollapse for modal windows (#249) 2015-06-23 15:17:27 -06:00
ocornut
06ed9257ef Modal windows centered when appearing (#249) 2015-06-23 14:28:11 -06:00
ocornut
2a041cfbe1 Added GetGlyphRangesCyrillic() helper (#237) 2015-06-23 14:13:22 -06:00
ocornut
0f38a53d28 Added stacked modal windows example (#249) 2015-06-23 13:58:47 -06:00
ocornut
f0311b643a Added modal dialog example (#249) 2015-06-23 13:22:37 -06:00
ocornut
a4cd585f54 Reorganized demo window 2015-06-23 12:47:38 -06:00
ocornut
fe17f6e735 Added modal window darkening of previous windows (#249) 2015-06-23 12:34:15 -06:00
ocornut
8c790a3234 BeginPopupModal() can have an optional close-window button (#249) 2015-06-23 11:08:19 -06:00
ocornut
bce495c581 Added BeginPopupModal() with actual modal behaviour (WIP api) (#249) 2015-06-23 10:02:56 -06:00
ocornut
0b98d3eb26 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-06-21 20:01:25 -06:00
ocornut
01cb0dc7f7 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-06-21 19:58:30 -06:00
ocornut
0884cb51cd Added IsKeyReleased() (#248), added keyboard & mouse state panel in the demo window 2015-06-21 19:04:43 -06:00
ocornut
68534c2319 Added IsMouseReleased() helper (#248) 2015-06-21 18:15:31 -06:00
ocornut
eec047c9f7 Fixed leak on Shutdown (#200) 2015-06-19 18:14:50 -06:00
ocornut
9e8da4dba0 Comments 2015-06-19 18:09:58 -06:00
ocornut
747999bbaf Fixed mouse wheel scroll issues, introduced a few weeks ago (#200) 2015-06-19 18:01:13 -06:00
ocornut
e7b43b014b Can't scroll with mouse wheel when window is collapsed. 2015-06-19 17:43:51 -06:00
ocornut
1b28f11acb InputTextMultiline() filtering out \r for now (#200) 2015-06-19 17:34:19 -06:00
ocornut
73db855c77 InputTextMultiline() painfully merged most computation passes into one, better clipping, much faster for large text (#200) 2015-06-18 23:23:20 -06:00
ocornut
84987ac3e0 ImFont::RenderText() better vertical clipping for large amount of text (for #200) 2015-06-18 23:08:42 -06:00
ocornut
324b1c2a28 InputTextMultiline(): made ctrl+up/down closer to windows behavior (#200) 2015-06-18 22:35:08 -06:00
ocornut
c4720ec90f InputTextMultiline() fixed a frame of lag in handling vertical scrolling (#200) 2015-06-18 21:20:15 -06:00
ocornut
cd27f8a8e6 InputText(): adjusting selection block height differently for single and multi-line (#200) 2015-06-18 21:01:56 -06:00
ocornut
b524c59c70 InputText(): removed a call to strlen() in the active edit path (#200) 2015-06-18 20:49:20 -06:00
ocornut
2b68a5c0cf InputTextMultine() optimised height calculation for inactive multi-line edit box (#200) 2015-06-18 19:09:04 -06:00
ocornut
86666489df ImFont: CalcTextSizeA() fixed font scaling with fallback character. 2015-06-18 18:31:49 -06:00
ocornut
c6d77f3bf5 InputText: fixed handling of scaled font. re-organized bits of code toward merging all sizes calculations (#200) 2015-06-18 18:31:13 -06:00
ocornut
10b4fa44c1 Fixed framerate counter averaging buffer size (shouldn't have been included in previous commit) 2015-06-18 17:45:11 -06:00
ocornut
26d2b361d1 InputText(): removed extraneous CalcTextSizeW call for tracking cursor/scrolling, remove spike (#200) 2015-06-18 17:40:51 -06:00
ocornut
5f362cabe9 InputText(): char width calculation calls font->GetCharAdvance() directly (#200) 2015-06-18 17:11:20 -06:00
ocornut
60079988bd ImFont::RenderText() faster handling of rendering above clipping rect (useful for #200) 2015-06-18 12:41:48 -06:00
ocornut
846cfc74a2 InputText() clear selection when using undo/redo (#200) 2015-06-18 12:32:55 -06:00
ocornut
d30e8f38b7 InputText() tidying up (#200) 2015-06-18 12:29:43 -06:00
ocornut
8fbb4a566a InputTextMultiline() preserve activeid/cursor/selection when using scrollbar + tidying up (#200) 2015-06-18 11:57:43 -06:00
ocornut
9180126db6 Speeding up some wchar<>UTF8 functions and some specialization for Ascii. (testing 500 KB text for #200) 2015-06-18 11:30:10 -06:00
ocornut
c06373de93 Cleanup 2015-06-18 10:40:11 -06:00
ocornut
d0ea5942a9 InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200) 2015-06-18 08:49:57 -06:00
ocornut
9c399ee3be Demo for InputTextMultiline() (#200) 2015-06-17 18:36:06 -06:00
ocornut
b0e8643523 Demo for InputTextMultiline() (#200) 2015-06-17 18:31:15 -06:00
ocornut
490e9e42ff InputText(): shallow tweaks (#200) 2015-06-17 18:14:25 -06:00
ocornut
5e323561be InputTextMultiline() fixes, vertical scrolling, optimizations (#200) 
Using a child window for multi-line text.
 2015-06-17 17:07:49 -06:00
ocornut
3df91b52ea Increased key repeat rate for non-character input key repeat. 
Dodgy - we should have a match here for character input and
non-character input (e.g. holding 'a' vs holding 'backspace' should be
same rate), but for the earlier we don't have the info?
 2015-06-17 16:02:50 -06:00
ocornut
7dc5228235 InputText: doesn't reset scrolling when active text input becomes bigger than its content. (#200) 
Mostly because it's expensive.
 2015-06-17 15:49:18 -06:00
ocornut
f75b8c72cf InputTextMultiline(): vertical scrolling wip, selection rendering fix (#200) 2015-06-16 21:53:04 -06:00
ocornut
417a7bc29b InputTextMultiline(): multi-line selection draw fix (#200) 2015-06-16 21:19:47 -06:00
ocornut
f1dfc4d7c4 InputTextMultiline(): multi-line selection draw fix (#200) 2015-06-16 21:17:02 -06:00
ocornut
917a1fdbf7 InputText() fixing cancel (#200) 2015-06-16 21:08:54 -06:00
ocornut
73491e5adc InputText() lifted 1024 characters limit (#200) 
Bit messy & not happy with using ImVector<char>
 2015-06-16 21:04:27 -06:00
ocornut
0795a60c6b InputText() fixed multi-line selection clipping. (#200) 2015-06-16 20:35:46 -06:00
ocornut
ec7c1834b3 InputTextMultiline() tabbing to a multi-line edit doesn't select all (unless ImGuiInputTextFlags_AutoSelectAll is set), somehow arbitrary (# 
Seems reasonable
 2015-06-16 20:25:08 -06:00
ocornut
6d31c498c0 InputText: multi-line selection, better scrolling, cleaning up (#200) 
Not horizontally scrolling on char boundaries anymore
 2015-06-16 20:14:54 -06:00
ocornut
d06ad43dca ImFont::RenderText() additional early out (typically performed at TextUnformatted() level for large chunks but this is also useful) (#200) 2015-06-16 17:50:55 -06:00
ocornut
748837acfd Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit 
Conflicts:
	imgui.h
 2015-06-16 17:23:28 -06:00
ocornut
a248575dea Text rendering can be finely clipped cpu-side on top and left axises (for #200) 2015-06-16 17:21:07 -06:00
ocornut
9765559a28 Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit 
Conflicts:
	imgui.cpp
 2015-06-16 15:59:28 -06:00
ocornut
34986771b4 Moved InputFloat() InputInt() below InputText() and not in the middle of internal bits 2015-06-16 15:57:04 -06:00
ocornut
0df7b472c2 InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling 2015-06-16 15:46:45 -06:00
ocornut
b360c83e92 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-06-14 20:29:10 -06:00
ocornut
7d860a0181 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-06-14 20:28:19 -06:00
ocornut
6eb1fec7a9 ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent. 2015-06-14 17:30:06 -06:00
ocornut
b503e5ee5b ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding (#243) 2015-06-14 16:18:22 -06:00
ocornut
4f0fa58ff2 Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125 2015-06-14 15:19:47 -06:00
ocornut
cf481e1a7b Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns (#125) 2015-06-14 12:41:40 -06:00
ocornut
2bcafc861e SelectableEx - replaced unnecessary extra size_draw parameter by a flag. 2015-06-13 14:20:02 -06:00
ocornut
96496ced5f Metrics windows display storage size 2015-06-11 16:04:06 -06:00
ocornut
039418f393 ColorButton(), ColorEdit4(): colored square stays square, used vertical padding on both axis. 2015-06-09 14:39:27 -06:00
ocornut
6bb06fdb81 Selectable, MenuItem: don't use frame rounding for hovering/selection. 2015-06-09 14:32:37 -06:00
ocornut
3fd4441f70 SetScrollPosHere() fixed imprecisions 2015-06-09 13:14:22 -06:00
ocornut
3ca54ad369 SetScrollPosHere() takes account of item height + more accurate centering 2015-06-09 12:57:27 -06:00
ocornut
e8422f7aa0 SetScrollPosHere() rewrote to that window size is not required at the time of calling, can be used on frame 0 of an auto-resizing window 2015-06-09 12:49:13 -06:00
ocornut
8c86322068 Combo() now using the popup facility. More consistent + when combo open hovering other widgets is disabled. (#241) 2015-06-09 12:35:55 -06:00
ocornut
6f1dd7a688 Allow Set*WindowSize() calls to be used with popups (fix for using e.g. scroll function on the first frame) 2015-06-09 12:32:19 -06:00
ocornut
6807546caf Allow Set*WindowSize() calls to be used with popups. 2015-06-09 11:35:29 -06:00
ocornut
4536668482 Fixed issue with activating a Combo() not taking active id (#241) 2015-06-09 10:09:12 -06:00
ocornut
20088303e9 ImFont: ignoring \r 2015-06-04 12:26:23 +01:00
ocornut
eb75ffdc5d DragFloat(), SliderFloat() Fixed rounding of negative which sometimes made the negative lower range unreachable. 2015-06-03 15:31:08 +01:00
ocornut
0e04dfbad7 Added IsWindowHovered() helper. 2015-06-02 20:57:29 +01:00
ocornut
9928d19af1 Version 1.41 WIP 2015-06-02 14:41:14 +01:00
ocornut
82d4180f39 Bits of TODO list 2015-05-31 21:15:35 +01:00
ocornut
931b8dcdaf Version 1.40 2015-05-31 19:31:02 +01:00
ocornut
a76eea85c8 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-05-31 16:59:01 +01:00
ocornut
ade7661b3f Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-05-31 16:57:43 +01:00
ocornut
8738147aee Windows: pragma link with user32.lib if we are using native clipboard function (unless IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS) #238 2015-05-31 15:55:32 +01:00
ocornut
1c2dac2a90 Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge) 2015-05-31 14:46:28 +01:00
ocornut
04e91500c5 Comments 2015-05-31 14:03:07 +01:00
ocornut
374d160234 BeginPopupContextWindow() in_empty_space_only -> !also_over_items (#126)+ comments 
Sorry if you used this parameter already.
 2015-05-31 12:55:12 +01:00
ocornut
bda0269133 ListBox() uses ImGuiListClipper helper, faster for large lists, assume evenly sized items. 2015-05-31 12:35:21 +01:00
ocornut
eb4ffd5dbd Added ImGuiListClipper helper to avoid using CalcListClipping() directly. 2015-05-31 12:33:24 +01:00
ocornut
446d8abfb0 ListBoxHeader() can return false. Also made ListBox() only use public API. 2015-05-31 11:54:00 +01:00
ocornut
df37df821e RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection. 2015-05-31 11:52:57 +01:00
ocornut
0539be7067 Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS 2015-05-31 11:17:58 +01:00
ocornut
03ff2faacb Comments 2015-05-31 11:01:22 +01:00
ocornut
9417df2a26 Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete) 2015-05-31 09:12:07 +01:00
ocornut
5ea23977f7 Fixed uninitialized fields in constructor - wouldn't have caused a problem (thanks Coverity!) 2015-05-29 14:54:33 +01:00
ocornut
f1f3424cdd Popups WantCaptureMouse active when popups/menus are active + using tracked mouse button ownership when mouse down (#126) 2015-05-29 11:42:35 +01:00
ocornut
73d1126bf4 Examples: OCD tweaks, a sign that we are near the release! 2015-05-29 11:15:24 +01:00
ocornut
448b262b37 Examples: Comments. 2015-05-29 11:11:50 +01:00
ocornut
83770e5e40 Examples: Tweaks. Usnig sprintf() in user-copiable code. 2015-05-29 11:05:17 +01:00
ocornut
0db6bac590 Examples: Tweaks, demo code creating graph data actually creates data at the correct rate. 2015-05-29 11:01:53 +01:00
ocornut
9ace617e7e Examples: Tiding up. Moved Dragging example higher up. 2015-05-29 10:52:45 +01:00
ocornut
616a7e6c61 Examples: Using a helper function for ? markers 2015-05-29 10:44:30 +01:00
ocornut
d86785ac98 Examples: Fixed Simple Layout example always showing. Using BeginPopupContextItem(). 2015-05-29 10:36:33 +01:00
ocornut
4144c59ce4 Added Simple Layout example applet 2015-05-29 10:29:26 +01:00
ocornut
15a26a479b Fixed auto-filling child window using WindowMinSize at their minimum size, irrelevant. Using an arbitrary small number instead. 2015-05-29 10:24:03 +01:00
ocornut
f0781d3a24 Added GetItemsLineHeightWithSpacing() helper. 2015-05-29 09:00:34 +01:00
ocornut
aaefe462bb Popups: calling OpenPopup() on already open popup doesn't close it's child (#126) 
Fixed previous commit.
 2015-05-28 23:47:01 +01:00
ocornut
78dc54ab3d Popups: calling OpenPopup() on already open popup doesn't close it's child (#126) 
It think it makes more sense? Maybe?
Note that calling OpenPopup() every frame probably doesn't make sense.
 2015-05-28 23:37:11 +01:00
ocornut
7847100ad8 Tweak BeginMenu() code 2015-05-28 23:14:25 +01:00
ocornut
733e079081 Moved CloseInactivePopups() and tweaked. 2015-05-28 23:04:29 +01:00
Branimir Karadžić
123fd73c8c Merge remote-tracking branch 'upstream/master' 2015-05-27 22:01:37 -07:00
Branimir Karadžić
cd9244ab15 Define STBTT_DEF extern when STBTT not compiled with ImGui. 2015-05-27 16:12:52 -07:00
ocornut
dcc7df2b21 Added BeginPopupContextVoid() helper for completeness (#126) 2015-05-27 23:28:53 +01:00
ocornut
235cca4f97 Fix to allow opening popup from a left-click on void or another window (because left-click would normally override focus immediately) (#126) 
Neither appears to be really useful frankly.
 2015-05-27 23:24:39 +01:00
ocornut
1cb6a294b0 BeginPopupContextWindow() rearranged and clarified parameters (#126) 2015-05-27 23:07:24 +01:00
ocornut
b0a9bbf6f6 Popup taking focus deactivate focused widget of other window (#126) 
e.g. focus InputText(), open contextual popup, input text used to stay
focused
 2015-05-27 22:58:49 +01:00
ocornut
f8b7d5c76d Tracking ActiveIdWindow along with ActiveId 2015-05-27 22:53:43 +01:00
ocornut
938528e5ee Added BeginPopupContextItem() / BeginPopupContextWindow() (#126) 2015-05-27 22:36:23 +01:00
ocornut
5b0861768e Fixed GetId()/BeginPopup() accessing current window in "append" mode 2015-05-27 22:26:03 +01:00
ocornut
8c4c421f74 Added IsAnyItemHovered() public helper. 2015-05-27 22:02:12 +01:00
ocornut
70f2ff0e5a No minimum size for popups 2015-05-27 21:59:02 +01:00
ocornut
99ff45ad2e Tweak context menu example 2015-05-27 21:42:16 +01:00
ocornut
90db64d4e3 Added context menu example on a DragFloat widget 2015-05-27 21:39:41 +01:00
ocornut
487500d291 Tweaks 2015-05-27 16:03:44 +01:00
ocornut
7d28fe5915 WIP Menus: Reverted f26de46350 for now (#126) 2015-05-27 15:51:50 +01:00
ocornut
d05c1d58c3 Oops 2015-05-27 15:44:07 +01:00
ocornut
405785ea62 ItemWidthStack can be empty, to remove one allocation per window 2015-05-27 15:42:29 +01:00
ocornut
0a7024c198 Store common stacked settings contiguously in memory to reduce cache misses & unnecessary heap allocations 2015-05-27 15:35:49 +01:00
ocornut
3d36c81241 Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() ! 2015-05-27 15:22:09 +01:00
ocornut
d69f2f57ee Added configurable io.KeyRepeatDelay, io.KeyRepeatRate 2015-05-27 15:17:44 +01:00
ocornut
904e187f70 Simplified some widget code, moving alignment to RenderTextClipped() 2015-05-27 14:39:41 +01:00
ocornut
3c264827fd Reordering parameters of internal RenderTextClipped() 2015-05-27 14:24:52 +01:00
ocornut
f841097e99 Button centering left to RenderTextClipped function. 2015-05-27 14:20:50 +01:00
ocornut
f26de46350 Button() closes active popup (#126) unsure about that 2015-05-27 09:28:44 +01:00
ocornut
e6ac9e88aa Refactor Button() and SmallButton() into a shared function ButtonEx() 2015-05-27 09:22:30 +01:00
ocornut
843219daec Spacing + untabify 2015-05-26 22:14:07 +01:00
ocornut
7b8b5754bc EndGroup() carries on the text base offset from the last line of the group (sort of incorrect but better than nothing) 2015-05-26 22:13:07 +01:00
ocornut
6f32684f15 Examples: various usage comments. 2015-05-26 21:36:44 +01:00
ocornut
15113f682e Added TextDisabled(), TextDisabledV() helpers. 2015-05-26 21:10:16 +01:00
ocornut
3a6e6645e6 WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. (#126) 2015-05-26 20:33:48 +01:00
ocornut
90cf77b191 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-26 18:03:46 +01:00
ocornut
6b3ccd3edf WIP Menus: Added support for disabled sub-menu (#126) 2015-05-26 18:02:42 +01:00
ocornut
0db122bc3b Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases (#126) 2015-05-26 17:48:28 +01:00
ocornut
fdce095101 Comments 2015-05-26 17:27:35 +01:00
ocornut
d009a85de4 WIP Menus: Implement amazon's dropdown-like triangle test for navigating sub-menus (#126) 2015-05-26 17:09:21 +01:00
ocornut
63a39dd08e WIP Menus: Recursive menu demo (#126). Actually useful to test sub-menu positioning. 2015-05-26 16:14:51 +01:00
ocornut
cdb5e16f70 SelectableEx: use flags internally (similar to ButtonBehavior) 2015-05-26 16:12:40 +01:00
ocornut
4eeba016f6 WIP Menus: Closing sub-menu when hovering something else in the same parent window (#126) 
Immediate open/close is error-prone
 2015-05-26 15:01:04 +01:00
ocornut
83b10f77a9 Comments 2015-05-25 23:47:59 +01:00
ocornut
98540370a0 WIP Menus: Layout in menu-bar tweaks to lay better when mixed widgets (#126) 2015-05-25 23:15:00 +01:00
ocornut
bb8cdcb916 WIP Menus: Layout in menu-bar more standard, allows mixing different widgets in menubar. (#126) 
Still some minor spacing bugs.
 2015-05-25 23:08:22 +01:00
ocornut
83cb040d20 Selectable: text baseline alignment for line that aren't of text height. 2015-05-25 23:03:16 +01:00
ocornut
44ed5640d3 WIP Menus: Sub-menu overlapping amount not hardcoded (#126) 2015-05-24 23:58:40 +01:00
ocornut
0836f69d9b WIP Menus: Fixed style.WindowPadding == 0 leading to zero-sized initial clipping rectangle leading to self-collapsing childs (#126) 2015-05-24 23:56:29 +01:00
ocornut
6c749934ec Combo: empty label doesn't add ItemInnerSpacing alignment, matching other widgets 2015-05-24 23:45:44 +01:00
ocornut
9abcbf73cb WIP Menus: Sub-menus appears over the parent-menu scrollbar if there is one (unsure about that) (#126) 2015-05-24 23:37:47 +01:00
ocornut
63aa035f59 WIP Menus: Fixed estimation of scrollbar width (broke in 292f08b11e) (#126) 2015-05-24 23:25:57 +01:00
ocornut
8c1d7daef8 WIP Menus: Fixed repositioning of menus when there's no room in the 4 quadrants., we still keep them within the visible display area (#126) 
vs popup which prefer to stay away from the mouse cursor
 2015-05-24 23:17:06 +01:00
ocornut
1ab1712849 WIP Menus: Clicking the label of an already open sub-menu doesn't close it unless from a menu-bar (match Windows behavior) (#126) 
Argh,
 2015-05-24 22:33:04 +01:00
ocornut
48ede93a58 WIP Menus: Fixed closing popup on menu item activation when a child menu is open from the popup (#126) 2015-05-24 22:30:48 +01:00
ocornut
53892ab893 WIP Menus: Fixed manually closing submenu affecting position of the following window (#126) 2015-05-24 21:20:10 +01:00
ocornut
292f08b11e WIP Menus: Fixed some alignment issues with non standard styles. Tweaked menu-bar color (#126) 2015-05-24 21:11:11 +01:00
ocornut
14bcfef041 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-24 17:32:10 +01:00
ocornut
8cfae35042 Added Dummy() helper 2015-05-24 17:30:59 +01:00
ocornut
89d1340225 WIP Menus: Added Enabled/Disabled option for MenuItem() (#126) 2015-05-23 13:54:57 +01:00
ocornut
485832fe06 WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples. 2015-05-23 13:43:45 +01:00
ocornut
e6b1e39847 WIP Menus: don't clamp windows within display when a position has been explicitly set by user. Menu item spacing uses ItemSpacing. (#126) 2015-05-23 13:43:13 +01:00
ocornut
e7097d6176 WIP Menus: menus now affected by WindowMinSize (#126) 2015-05-23 13:03:09 +01:00
ocornut
e3f2ad728a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
 2015-05-21 22:57:29 +01:00
ocornut
cc3ed515ca Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-21 22:52:46 +01:00
ocornut
882b4a5eb4 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.cpp
 2015-05-21 22:51:21 +01:00
ocornut
7fbe6574c6 Removed unnecessary PushTextureId/PushClipRect/PopClipRect/PopTextureId on multiple Begin/End pairs 2015-05-21 22:45:32 +01:00
ocornut
8a6d543bc9 ImDrawList: merge draw command better, cases of multiple Begin/End gets merged properly 2015-05-21 22:43:28 +01:00
ocornut
6a1eba2d0a Fixed appending multiple times to an existing child via multiple calls to same BeginChild/EndChild 2015-05-21 22:21:00 +01:00
ocornut
14ab9708be Removed a few empty lines 2015-05-20 10:31:05 +01:00
ocornut
df276b82da Updated FAQ for usage of ## to display empty label 2015-05-19 23:33:55 +01:00
ocornut
e43c5cd3d3 InputText: Fixed cursor generating a zero-width wireframe rectangle turning into a division by zero. 2015-05-18 23:42:12 +01:00
ocornut
0cdd050cd7 WIP Menus: fixed recycling menu level during the same frame (#126) 
We could also enforce "clearing" the window and recycle immediate which
sort of work, but it would be a less tested code path.
 2015-05-18 21:26:46 +01:00
ocornut
6da8a77fa3 WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) (#126) 2015-05-18 19:41:02 +01:00
ocornut
9bdacaf08d WIP Menus: click again to toggle + allow hovering in same menuset even outside of a menubar (#126) 2015-05-18 19:12:36 +01:00
ocornut
75ec4841df WIP Menus: menu opens on press (not release), uses popup style hovering, allow switch between menus at parent site (#126) 2015-05-18 18:44:15 +01:00
ocornut
e674df8101 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-18 16:45:55 +01:00
ocornut
097fe51f97 Hovering require to hover same child window. Reverted 860cf578f5 (December 3), replaced by a flag resize grip. 
Might break something if you have childs overlapping non-childs.
 2015-05-18 16:42:55 +01:00
ocornut
060f879816 Tweak internal ButtonBehavior() to ease passing extra options 2015-05-18 16:39:37 +01:00
ocornut
7184de24b8 WIP Menus: scrolling section of the window is clipped by the menu bar (#126) 2015-05-18 15:54:56 +01:00
ocornut
a17c930d1f WIP Menus: Added example menu, move app examples to a sub-menu (#126) 
NB: menus do not react on click yet, with popup-style blocking of other
inputs yet
 2015-05-17 23:19:05 +01:00
ocornut
09abf11e56 WIP Menus: BeginMenuBar() return false on window without a menu bar (#126) 2015-05-17 23:13:53 +01:00
ocornut
4bd43bdb35 Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu 2015-05-17 22:28:57 +01:00
ocornut
7f3f3891c0 WIP Menus: fixed case where zero-sized display (e.g. minimised window) clips popups/menus and asserted (#126) 2015-05-17 22:15:40 +01:00
ocornut
88d7b3de23 WIP Menus: fixed hovering handling of menus from menu bars (#126) 2015-05-17 17:21:49 +01:00
ocornut
f2b738648f WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. (#126). 2015-05-17 17:13:45 +01:00
ocornut
6251d37987 WIP Menus: further fixes for resizing (#126) 2015-05-17 15:48:56 +01:00
ocornut
f44526cc45 Selectable(): horizontal filling not declared to ItemSize() so Selectable(),SameLine() works and we can best auto-fit the window 2015-05-17 13:09:46 +01:00
ocornut
e912bcb36d Comments 2015-05-17 12:10:57 +01:00
ocornut
ecda785cbc Popups: fix to allow child popups to be opened from a normal window without an intermediate popup window. 2015-05-15 23:57:43 +01:00
ocornut
4250357ed2 Selectable: using window->WindowPadding() to work within non-padded child windows 2015-05-15 22:39:52 +01:00
ocornut
79a95256e8 Window: fixed auto-fit calculation mismatch of whether a scrollbar will be added by maximum height clamping. 
Also honor NoScrollBar in the case of height clamping, not adding extra
horizontal space.
 2015-05-15 22:36:31 +01:00
ocornut
3115e546aa Style editor: fixed slider for indent spacing. 2015-05-15 21:55:54 +01:00
ocornut
c1b55991c0 Window: fixed child window sizing lag + minimum size clamping lag 2015-05-15 21:40:45 +01:00
ocornut
70f83a3a65 Popups: child popups (menus) hidden on their first frame the same way as regular popup 2015-05-15 20:35:28 +01:00
ocornut
e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
	imgui.h
 2015-05-15 17:33:04 +01:00
ocornut
1eafe86627 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-15 17:31:56 +01:00
ocornut
81937d34a8 Popups: made OpenPopup()/close loops reclaim focus and update popup position. It is generally a mistake but it's now more easy to understand 2015-05-15 17:29:42 +01:00
ocornut
fa0f0f4507 ImVector: tweak growth strategy 2015-05-15 13:14:46 +01:00
ocornut
1fe2906923 Metrics: do not count free(NULL) calls. Settings: contiguous allocations for ImGuiIniData. 2015-05-15 12:45:35 +01:00
ocornut
900394a612 Metrics: metrics window shows popups list 2015-05-15 12:24:05 +01:00
ocornut
222a9231bb Examples: Console: example uses standard malloc/free, makes more sense as a copy & pastable example 2015-05-15 12:09:34 +01:00
ocornut
d9ca8f3145 Added IO.MetricsAllocs counter (number of memory allocations 2015-05-15 12:05:05 +01:00
ocornut
d9b2a90773 Popups: fixed child windows within popups vs handling of sub menus. Added examples. 2015-05-15 11:30:51 +01:00
ocornut
748072c045 Popups: identifying popups by their id to avoid conflict when recycling popup durnig same same (CloseCurrentPopup followed by Open+Begin) 2015-05-14 15:15:17 +01:00
ocornut
e57ee2852a Comments 2015-05-14 11:32:12 +01:00
ocornut
1e4c22c206 Added io.MetricsActiveWindows counter (#213) 2015-05-12 16:08:34 +01:00
ocornut
5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. (#224) 2015-05-12 15:16:12 +01:00
ocornut
4b088ec7e8 ImFontAtlas: Fix toward allowing to add extra font without clearing existing one (need to comment out ClearInputData) (#224) 2015-05-12 15:10:36 +01:00
ocornut
9d9cf31972 ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit (#224) 2015-05-12 14:53:29 +01:00
ocornut
ad79db32c7 Window title text centering tweaks, RenderTextClipped() now has different args for pos_max and clip_max #222 2015-05-12 14:02:45 +01:00
ocornut
356a37edcf Added window title text horizontal alignment option (#222),, ImGuiAlign_ type for future use. 2015-05-12 11:49:24 +01:00
ocornut
03720acaff Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-12 10:11:14 +01:00
ocornut
9be3319653 Tweaks, comments around ImFontAtlas 
Removed unsigned int from API
 2015-05-12 09:08:47 +01:00
ocornut
9e307d60e3 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-11 21:45:13 +01:00
ocornut
515e0c6122 Cleanup, merged duplicate code into a function 2015-05-11 21:44:50 +01:00
ocornut
317744489f WIP Menus: sub-menu arrow alignment take account of extension by other widgets (#126) 2015-05-11 20:58:07 +01:00
ocornut
5082182790 Merge remote-tracking branch 'origin' into 2015-05-menus 
Conflicts:
	imgui.h
 2015-05-11 20:39:19 +01:00
ocornut
ba7a4fc034 WIP Menus: minor cleanup using a ImGuiSimpleColumns helper type (#126) 2015-05-11 20:34:52 +01:00
ocornut
7fb704d308 WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) (#126) 
May remove the ImGuiWindowFlags_Menu alltogether
 2015-05-11 19:52:02 +01:00
ocornut
79198fd6a5 Default item width for AlwaysAutoResize windows expressed as a factor of font height 2015-05-11 19:47:01 +01:00
ocornut
34aad73fd8 Added ImGuiCol_TextDisabled 2015-05-11 19:36:32 +01:00
ocornut
141ac8beab Tweaks 2015-05-11 18:28:30 +01:00
omar
33a2fd368a Merge pull request #218 from paperManu/inputNFlags 
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
 2015-05-11 16:54:12 +01:00
Emmanuel Durand
b3faed610d Renamed flags to extra_flags in last commit 2015-05-11 11:40:08 -04:00
ocornut
fcd08ed8d4 BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126) 2015-05-11 15:57:02 +01:00
Emmanuel Durand
94b7c9e307 Input text flags added to InputFloatN and InputIntN 2015-05-11 10:15:22 -04:00
Stefano Cristiano
99a1a85f1f Example fix PopStyleVar on Vertical Slider to avoid assertion 
Adding an explicit ImGui::PopStyleVar to avoid assertion in
CheckStacksSize
 2015-05-11 14:45:49 +02:00
ocornut
4a41ce9414 InputText: make sure Ctrl+V has ONLY the control key pressed (follow up to #214) + tidying 2015-05-11 09:29:10 +01:00
ocornut
c2c43928a9 Untabifiy 2015-05-11 09:26:53 +01:00
ghassanpl
bb2d3a8b41 * make sure letter-key shortcuts have ONLY the control key pressed (fixes bug for AltGr->Ctrl+Alt on windows) 2015-05-10 22:41:28 +02:00
ocornut
6c1084eaa1 Shutdown() test for g.IO.Fonts not being NULL to allow workarounds in case of using multiple contexts #207 2015-05-09 10:27:03 +01:00
ocornut
f293bec97c Added style.ScrollbarRounding #212 2015-05-09 10:13:56 +01:00
ocornut
d23709ce35 Merge remote-tracking branch 'origin' into 2015-05-menus 2015-05-09 10:02:48 +01:00
ocornut
9fe654c6e4 Assert on modifiers stack size mismatch between Begni()/End() pairs #204 
Experimenting with this. It's helpful but not happy with the idea of
ImGui asserting on that sort of user error.
 2015-05-09 09:59:46 +01:00
ocornut
debe6522bb Examples: test for tooltip over popup. 2015-05-07 19:00:17 +01:00
ocornut
33e8fb85cf Allow stacking popups, not really useful yet (wip #126) 2015-05-07 18:43:08 +01:00
ocornut
dd2a578012 Added ImGuiSetCond_Appearing to test the hidden->visible transition. 2015-05-07 18:39:23 +01:00
ocornut
f46557d2d6 MenuItem() draft for popups, with Selected option (wip #126) 2015-05-07 17:21:48 +01:00
ocornut
c36172ebef Tweak RenderCheckMark() 2015-05-07 17:11:32 +01:00
ocornut
85b8967291 Added RenderCheckMark() helper following the font size 
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
 2015-05-07 17:06:07 +01:00
ocornut
13c3f11c66 Comments (#209) 2015-05-07 11:36:16 +01:00
ocornut
fbbe7fee53 Fix "Debug" window stealing focus/popup #208 #209 @thevaber 2015-05-07 11:24:51 +01:00
ocornut
25d8c1af91 Removed inline marker #210 2015-05-07 10:48:05 +01:00
ocornut
e7ffcea33d Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same). 2015-05-03 14:26:47 +01:00
ocornut
b1b23d6ca9 Autofit cancel out one worth of vertical spacing for correct symmetry (group and tooltip already do that) 2015-05-03 13:52:53 +01:00
ocornut
0ca7926b94 Popup auto-border doesn't spread to its childs #197 2015-05-03 13:04:43 +01:00
ocornut
a3a10d4a3c Popup have borders by default #197 attenuated border alpha in default theme 2015-05-03 12:17:53 +01:00
ocornut
47e875314b Plot: overlay label clipped within frame when bigger than frame 2015-05-03 11:32:39 +01:00
ocornut
f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-05-02 22:20:48 +01:00
ocornut
08fd6a7e7d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-05-02 22:20:14 +01:00
ocornut
d84b5737a6 Popups, Tooltips: fit within display. Hidden during size calculation. Fixed popups flicker when changing size. 
Big change, needed reorder of Begin(). May trigger new bugs.
 2015-05-02 18:22:46 +01:00
ocornut
99e315d2b2 Fix for width of child windows with scrollbar (broken 376a6a5af0) 2015-05-02 18:14:24 +01:00
ocornut
221f36e116 Comments, tweaks, metrics window tweak 2015-05-02 17:54:25 +01:00
ocornut
a3560b274e Tidying up Begin(): using local copy of 'flags' for brevity 2015-05-02 17:45:54 +01:00
ocornut
6ca4b31bf8 Fixed popup resizing (broken 376a6a5af0) 2015-05-02 15:54:35 +01:00
ocornut
a906738ba7 Renamed Visible->Active internally 2015-05-02 13:20:50 +01:00
ocornut
1b5795c96d InputText: fixed incorrect edit state after text buffer is modified by user through callback #206 2015-05-02 12:45:53 +01:00
ocornut
81bf614821 Fix window size after collapsing (broken 376a6a5af0) 2015-05-02 12:35:34 +01:00
ocornut
7fac4013a4 Build fix 2015-05-02 12:22:52 +01:00
ocornut
4e292bf67d Tidying up Begin(): separated blocks needed for auto-resize so it can be moved above position calculation later 2015-05-02 12:20:06 +01:00
ocornut
376a6a5af0 Tidying up Begin() separated blocks needed for auto-resize so it can be moved above position calculation later 
Being cautious again. Hopefully didn't break anything.
 2015-05-02 12:08:24 +01:00
ocornut
46f55fe6f6 Tidying up Begin() 2015-05-02 10:46:24 +01:00
ocornut
3f7f256752 Tidying up. Re-arranged the (first_begin_of_the_frame) blocks in Begin() for further changes. 
Being cautious.
 2015-05-02 10:32:32 +01:00
ocornut
19f7bf90f8 Examples: AutoResize demo doesn't use TextWrapped() 2015-05-01 21:01:54 +01:00
ocornut
07ebb14ce2 Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus. 2015-05-01 20:35:44 +01:00
ocornut
68ccdc4fb8 Comments 2015-05-01 11:07:30 +02:00
ocornut
8fbb42cc6f Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures 
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
 2015-04-28 18:12:24 +02:00
ocornut
2440a30444 Columns() distinguish columns-set ID from other widgets as a convenience, added asserts, added more sailors 2015-04-28 18:09:38 +02:00
ocornut
bd23c11a93 Separator() within group start on group horizontal offset #205 2015-04-27 22:19:14 +02:00
ocornut
1d90f099bd Tidying up 
We still have an issue with ImVec4 vs ImRect
 2015-04-26 13:17:56 +02:00
ocornut
6844952d56 Fixed build with Visual Studio 2008 or earlier (via PR #203) 2015-04-24 09:22:29 +02:00
ocornut
c93a562b06 Added ImGuiStorage::GetVoidPtrRef() 2015-04-21 10:12:17 +01:00
ocornut
9119f58ce5 Version number 1.39 WIP 2015-04-21 10:09:20 +01:00
ocornut
37d8d78fc2 Selectable() render into AutoFitPadding only when full-fitting (fix aac99819d6) 2015-04-19 23:37:50 +01:00
ocornut
064b94721e Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4. 2015-04-19 23:28:57 +01:00
ocornut
94c4e9564d Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-04-19 23:00:14 +01:00
ocornut
86d1abf3f6 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-19 22:59:53 +01:00
ocornut
05ee36baab Version number 1.38 2015-04-19 22:59:27 +01:00
ocornut
85e18c72d2 ShowTestWindow(): drag example + tooltip. 2015-04-19 22:57:39 +01:00
ocornut
731b003c9d Slider internals: removed unnecessary slider_bb parameter 2015-04-18 19:34:05 +01:00
ocornut
acbd58627f ShowTestWindow(): added a custom label in the format for one of the slider example. 2015-04-18 17:35:40 +01:00
ocornut
c46d5634d4 Columns: mouse dragging uses absolute mouse coords. Fixed dragging left-most column of an auto-resizable window. #125 2015-04-18 13:46:28 +01:00
ocornut
c82f909be1 Active column (when dragged) not clipped so it can release its active state (extends 16ddd796f3) 2015-04-18 12:11:59 +01:00
ocornut
26e469af22 Documentation 2015-04-18 09:19:41 +01:00
ocornut
02de9bd859 DragFloat, DragInt: if step/speed is zero defaults to 1% of range #180 2015-04-17 10:01:39 +01:00
ocornut
4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	imgui.cpp
 2015-04-17 08:42:36 +01:00
ocornut
1847270a5f Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-17 08:41:16 +01:00
omar
6408ac482c Merge pull request #199 from bkaradzic/master 
Fixed C4267 size_t to unsigned int conversion warning.
 2015-04-17 08:09:07 +01:00
Branimir Karadžić
6920e70e2e Fixed C4267. 2015-04-16 15:52:35 -07:00
ocornut
7fde17e15a ShowMetricsWindow(): renaming locals (not sure about the "shadows a local variable" warning?) 2015-04-16 23:30:48 +01:00
Branimir Karadžić
508d05414a Fixed warning: missing initializer for member. 2015-04-16 14:45:42 -07:00
Branimir Karadžić
b7b3df3c81 Fixed: warning: declaration shadows a local variable 2015-04-16 14:42:17 -07:00
Branimir Karadžić
d24474ea82 Fixed: warning: missing field 'w' initializer [-Wmissing-field-initializers] 2015-04-16 14:39:04 -07:00
ocornut
64db50ba46 TODO list 2015-04-16 10:58:30 +01:00
ocornut
aca85dbea4 Fixed hovering over a popup's child (popups disable hovering on other windows but not their childs) #197 2015-04-16 10:54:56 +01:00
ocornut
de3a154f38 Tweak date/credits 2015-04-14 12:00:12 +01:00
ocornut
43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
 2015-04-14 09:51:28 +01:00
ocornut
0bb89ccee2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-14 09:49:04 +01:00
ocornut
dd36e8bf2b Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete). 2015-04-13 22:04:28 +01:00
ocornut
d11b4160aa Added IsItemVisible(). Made IsClipped() also return false when log is enabled. 2015-04-13 21:52:38 +01:00
ocornut
16ddd796f3 Active widgets is not clipped, so it can always release its active state (mentioned in #143) 
Otherwise a change in layout moving active widget to a clipped region
may lock the active id.
 2015-04-13 20:59:44 +01:00
ocornut
9918ec31d6 Added ResetMouseDragDelta() for iterative dragging operations 2015-04-13 19:54:40 +01:00
ocornut
a143e2e772 Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies 2015-04-13 14:45:27 +01:00
ocornut
750b6c9224 DragFloat() fixed clamping #180 2015-04-13 00:07:41 +01:00
ocornut
6ed06a8dc8 DragFloat() added power parameter for logarithmic drag on both side of zero #180 2015-04-13 00:03:57 +01:00
ocornut
f5ad362912 DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180 2015-04-12 19:15:55 +01:00
ocornut
b308d2728b Remove stray tabs 2015-04-12 10:45:00 +01:00
ocornut
adae98664e Comment on the newly added binary_to_compressed_c.cpp helper program 2015-04-12 10:31:10 +01:00
ocornut
88725be381 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-11 18:13:43 +01:00
ocornut
7ca21a1bc2 Fixed prototypes 2015-04-11 18:12:11 +01:00
ocornut
ac740170b9 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 18:00:09 +01:00
ocornut
bff9a6b6e3 Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool 2015-04-11 17:52:51 +01:00
ocornut
c3a71f5472 AA branch: Minor optimisation merge + thickness for non-aa strokes. 2015-04-09 23:00:55 +01:00
ocornut
dbc9b2ec9b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
 2015-04-09 22:56:13 +01:00
ocornut
6bdb8719e2 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 2015-04-09 22:50:18 +01:00
ocornut
a48130b682 ImDrawList: Minor optimisation. 2015-04-09 22:49:18 +01:00
ocornut
e0cd947904 AA branch: Fixes. 2015-04-09 22:40:50 +01:00
ocornut
1e69175403 AA branch: Test disabling aa at runtime for stroke and fill. 2015-04-09 22:31:26 +01:00
ocornut
431e391ccd AA branch: fixed circles. 2015-04-09 21:51:33 +01:00
ocornut
dd893ac4f5 Warning fix. 2015-04-09 21:43:42 +01:00
ocornut
14ddb81f7a AA branch: remove code unnecessary for this branch. 2015-04-09 21:39:56 +01:00
ocornut
39445cf23a Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 
Conflicts:
	imgui.cpp
	imgui.h
 2015-04-09 21:38:30 +01:00
ocornut
1746b04065 Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat 2015-04-09 21:05:35 +01:00
ocornut
500a8a0e02 ImDrawList: bits of renaming. 2015-04-09 21:00:45 +01:00
ocornut
4fa3eee84e Renamed io.MetricsVertices to io.MetricsRenderVertices 2015-04-09 19:47:41 +01:00
ocornut
aa1a96f907 ImDrawList: inline AddVtx() calls for profit in highly debug builds 2015-04-09 18:34:31 +01:00
ocornut
707df6c7b7 ImDrawList: internal refactoring toward a following commit for indexed rendering. 2015-04-09 17:32:03 +01:00
ocornut
742808d835 Tweaks. 2015-04-09 17:24:09 +01:00
ocornut
15f82e0deb Fix rounded frames to follow previous change 2015-04-09 17:20:57 +01:00
ocornut
aa2935968e Renamed AddArcFast() parameter 'tris' to 'filled' 2015-04-09 16:47:20 +01:00
ocornut
f38cca09cf Merge branch 'master' of https://github.com/ocornut/imgui 2015-04-09 16:45:21 +01:00
ocornut
0fc1f5b17f Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc 2015-04-09 16:45:14 +01:00
Stephan Dilly
2bb6e31520 fix unused variable warning by clang 2015-04-09 16:50:54 +02:00
ocornut
200d3482dc Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16 2015-04-09 00:49:21 +01:00
ocornut
13fab08cdb Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-08 20:37:18 +01:00
ocornut
3c6257b8b9 Fixed IsRootWindowOrAnyChildFocused() crashing if no window has focus (introduced yesterday in c38c54af52) 2015-04-07 14:04:43 +01:00
ocornut
6e99688fa7 Fixed user-facing version of IsItemHovered() ignoring overlapping windows 2015-04-07 14:03:17 +01:00
ocornut
323ae8326e Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-04-07 13:51:01 +01:00
ocornut
d692286862 Added ShowMetricsWindow() 2015-04-07 13:42:35 +01:00
ocornut
8211081c54 Added (not exposed) DisableHideTextAfterDoubleHash to disable ## processing. 2015-04-07 13:37:30 +01:00
ocornut
33ef3992f7 Added IO.MetricsVertices counter 2015-04-07 13:36:11 +01:00
ocornut
6e4d3dac1a Examples: Fixed ShowExampleAppManipulatingWindowTitle() not doing the right thing, broken in ff35d24bcc 2015-04-07 11:54:53 +01:00