Commit Graph
100 Commits
Author SHA1 Message Date
ocornut b54cb1c24c Merge branch 'master' of https://github.com/ocornut/imgui 2015-07-02 20:49:36 -06:00
ocornut b37a326163 Renamed GetScrollPosY() to GetScrollY(). (#150)
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
2015-07-02 20:47:04 -06:00
ocornut 531d0ce7ce Moving tooltips and popup chunks of imgui.h below widgets (#219) 2015-07-02 14:55:30 -06:00
ocornut 0201fe6ed1 Comments 2015-07-02 14:49:38 -06:00
ocornut 9bedcb5304 Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content (#150) 2015-07-02 14:46:49 -06:00
ocornut 1b01137c90 Fixed text baseline alignment of small button (no padding) after regular buttons
Currently being a coward and only doing it via the SmallButton() entry
point.
2015-07-02 12:44:48 -06:00
ocornut bbc22ac8ca Comments + remove trailing comma 2015-07-02 11:26:35 -06:00
ocornut e0da1e0658 Split into CaptureKeyboardFromApp() / CaptureMouseFromApp() 2015-07-02 09:20:15 -06:00
ocornut 77fad80e9f Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing 2015-07-02 09:10:31 -06:00
ocornut eaaab0120a Moved Inputs utilities to their own section in imgui.h + additional comments 2015-07-02 08:57:17 -06:00
ocornut fc7b562635 Added font links courtesy of twitter + instructions for fonts compressed in C array 2015-07-02 08:16:23 -06:00
ocornut 57f70a29b2 Fixed a bug with TextUnformatted() clipping of long text (#257) 2015-07-02 07:42:29 -06:00
ocornut 0e5b64ecd2 SetScrollPosHere() Minor hack for effective "scroll to top" to appear like user expect it (#150)
Compensate the difference between WindowPadding and ItemSpacing
2015-07-01 19:01:27 -06:00
ocornut 824cf5ae85 Fixed window padding being reported incorrectly for child windows with borders when parent have no borders 2015-07-01 18:55:42 -06:00
ocornut 3d7b596a40 SetScrollToPosHere() fixed imprecision + handling lower gap better for bottom alignment (#150) 2015-07-01 18:23:11 -06:00
ocornut 49b7a8e61f Added scroll tracking example with SetScrollPosHere() (relate #150) 2015-07-01 18:01:43 -06:00
ocornut b74d8e4c87 SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150) 2015-07-01 17:51:44 -06:00
ocornut c39372e7d5 Title bar uses TitleBgActive color even when window has popups/menus over (#253) 2015-06-30 13:52:00 -06:00
ocornut 47826830af Adding TitleBgActive color - still issues with popups/menus (#253) 2015-06-30 13:40:13 -06:00
ocornut 0e3198edc2 Tidying up - renamed FindBestWindowPos() to FindBesttPopupWindowPos() 2015-06-29 15:18:26 -06:00
ocornut af0de5f357 Tidying up - ImRect doesn't use ImVec2 operators (so we can expose it later) 2015-06-29 13:30:37 -06:00
ocornut 882c7a8cef Tidying up - ShowUserGuide, ShowStyleEditor only uses public calls 2015-06-29 13:20:28 -06:00
ocornut 039ebb79f4 Tidying up - renamed a few internal functions 2015-06-29 13:18:44 -06:00
ocornut 8b392feba1 Tidying up - moved ImFontAtlas glyph ranges helpers outside of ImFont block 2015-06-29 12:36:24 -06:00
ocornut 0783697f87 Minor tidying up 2015-06-29 10:39:17 -06:00
ocornut 4ac21aaa12 Version number 1.42 wip + todo list entries 2015-06-26 20:48:53 -06:00
ocornut f66be0e7b2 Demo: satisfying buffer size 2015-06-25 21:52:16 -06:00
ocornut ea2c824192 Version 1.41 2015-06-25 21:38:24 -06:00
ocornut 8224ca16b6 Carriage return in demo tooltip 2015-06-24 20:45:06 -06:00
ocornut 4976bf97a6 Fix for correctness and allow non-auto resized modals to have window minimum size applied - hopefully no-side effects (#249) 2015-06-24 20:35:40 -06:00
ocornut af5890b276 AutoFit can be triggered on each axis separately via SetNextWindowSize() (mentioned in #249) 2015-06-24 20:08:08 -06:00
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 f10bbbb851 Minor comment fix (#248) 2015-06-22 07:57:45 -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 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 c82e72eecb Selectable() parameter comment 2015-06-14 15:14:33 -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