1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-09-25 03:58:36 +02:00
Commit Graph

714 Commits

Author SHA1 Message Date
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
ocornut
0505995193 Very minor code/comments tweaks. 2015-01-04 22:29:53 +00:00
ocornut
4905ec46f1 Fixed hovering of child windows / combo boxes that extend beyond the root window limits. 2015-01-04 22:07:37 +00:00
ocornut
3fe669f547 Failure in LogToFile() treated at an error (assert) in the absence of another type of error handling. 2015-01-04 21:37:49 +00:00
ocornut
22c1d7eded Renamed some color enums 2015-01-04 19:37:24 +00:00
ocornut
39373b563b Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI 2015-01-04 19:23:36 +00:00
ocornut
97d34271f8 Fix clipboard pasting into an InputText box not filtering the characters according to input box semantic (number, etc.) 2015-01-04 18:47:08 +00:00
ocornut
a5f4108781 Activating widget bring parent window to front 2015-01-04 18:36:33 +00:00
ocornut
3674d30e90 Fixed clicking on Combo box label. 2015-01-04 18:32:15 +00:00
ocornut
2268b098e0 Avoid marking settings as dirty when window is marked unsaved + minor FocusWindow() optimisation 2015-01-04 18:23:30 +00:00
ocornut
4bccc06933 Dragging outside area of a widget while it is active doesn't trigger hover on other widgets. 2015-01-04 18:12:30 +00:00
ocornut
ee49c2288d Todo items. 2015-01-03 17:38:10 +00:00
ocornut
34664dc28c InputText() consume input characters immediately (fixes #105) 2015-01-03 17:37:39 +00:00
ocornut
12225abfe2 Version number (fix) 2014-12-31 10:38:36 +00:00
ocornut
505bd1a66d Fixed text input filtering for character in the 128-255 range. 2014-12-31 09:49:53 +00:00
ocornut
f8c58fe328 Fix for Clang 2014-12-30 16:55:32 +00:00
ocornut
74ab555558 Examples: Console:: added support for History callbacks + cleanup to be self contained. 2014-12-30 16:49:39 +00:00
ocornut
3b028c7ebf Fixed InputInt() InputFloat() label not declaring their width, breaking SameLine (bug #100)
+ shallow cleanups
2014-12-30 15:38:28 +00:00
ocornut
2d111ccb55 crc32 on strings is performed in one pass - removed the strlen() call. 2014-12-30 15:18:21 +00:00
ocornut
209be54e49 Version number 2014-12-30 12:21:57 +00:00
ocornut
aa750d538d Style editor: added an Output button to output colors to clipboard/tty 2014-12-30 12:08:33 +00:00
ocornut
929f127d06 Added SliderInt2(), SliderInt3(), SliderInt4() for consistency 2014-12-30 11:54:04 +00:00
ocornut
60b4389ac1 Empty label consistently remove the inner-padding normally preceeding the label. 2014-12-30 11:41:46 +00:00
ocornut
a950df6655 Tightening default style (saving -2 pixels on each axis per widget) 2014-12-30 10:00:00 +00:00
ocornut
409b1ac6b5 Log output \r\n under Windows so files are readable with Notepad 2014-12-29 20:41:27 +00:00
ocornut
036a153cf4 Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText(). 2014-12-29 20:18:52 +00:00
ocornut
886d954e3d GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing 2014-12-29 19:56:01 +00:00
ocornut
39952d2362 Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers 2014-12-29 18:17:54 +00:00
ocornut
1b25fa8169 Added LogFinish() to stop logging at an arbitrary point. 2014-12-29 18:13:41 +00:00
ocornut
0796dc0dc1 Minor fix for cases of malformed .ini file (zero-terminating text file like it was before previous commit). 2014-12-29 18:05:22 +00:00
ocornut
8994f2f1e4 Cleanup. Removed unnecessary calls to sqrtf(). Factoring bits into ImLoadFileToMemory(). Added index of static helpers. 2014-12-29 11:23:03 +00:00
ocornut
e2fbbe0274 Factoring bits out of Begin() into a private CreateNewWindow() funciton
(Hopefully to ease a bit the merging work for ProDBG)
2014-12-28 17:54:02 +00:00
ocornut
5b7ed5432e CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it) 2014-12-28 16:17:08 +00:00
ocornut
bf3212c681 Taking notes of issues/todo 2014-12-28 16:09:19 +00:00
ocornut
34728394ec Fixed clipped ImGui::Combo not registering its size properly (was flickering when scrolling with combo on the edge of clipping region) 2014-12-26 12:38:13 +00:00
ocornut
90351298d1 Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin(). 2014-12-22 13:29:39 +00:00
ocornut
69f3d67d18 Preserve windows position on zero-sized display (minimized). 2014-12-22 02:14:31 +00:00
ocornut
ac29859f70 Support zero-sized display, now sets default as -1,-1 and assert if display size is negative. 2014-12-22 01:45:13 +00:00
ocornut
a3af51fd4e Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API 2014-12-19 12:56:00 +00:00
omar
7e868e2842 Cleanup todo list, removed 3 done items + added 1 new 2014-12-11 10:12:52 +00:00
omar
0056ccce26 Version number 2014-12-10 23:40:25 +00:00
omar
e9e0e36f98 New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
2014-12-10 19:22:30 +00:00
omar
3399890a84 Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app. 2014-12-10 17:13:45 +00:00
omar
bdb2344db0 ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading? 2014-12-08 17:14:54 +00:00
Daniel Collin
317dab5269 Clang warning fixes 2014-12-06 13:49:46 +01:00
ocornut
e43cd6e97f Added IMGUI_INCLUDE_IMGUI_USER_H 2014-12-05 23:09:43 +00:00
omar
a5cc2e4161 Fixed InputInt() writing to output when it doesn't need to, which break with large int due to int<>float conversions. Added todo note. 2014-12-05 12:34:14 +00:00
omar
d133831909 In-code FAQ: added comment about reading WantCaptureMouse / WantCaptureKeyboard 2014-12-04 11:42:13 +00:00
omar
860cf578f5 Added ImGuiWindowFlags_NoScrollWithMouse flag.
ButtonBehaviour test hovering of CurrentRootWindow (vs CurrentWindow, different for child-windows). This is intentionally meant to fix grabbing the lower-right resize grip when lower-right corner has a child-window, but may be the overall right-er test. Testing out.
2014-12-03 18:17:10 +00:00
ocornut
7f804d3d64 Tab->Spaces :( visual studio can't even be trusted for that, oh thanks. 2014-11-30 16:56:35 +00:00
ocornut
0f29cd7a14 Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block. 2014-11-30 15:54:58 +00:00
ocornut
a5a84a9b69 Tab->Spaces :( 2014-11-30 15:53:47 +00:00
ocornut
2e576de9ca Fix comments 2014-11-30 15:00:07 +00:00
ocornut
38164a410d ImStrnicmp tweak 2014-11-30 12:31:43 +00:00
omar
31654958f9 Merge pull request #92 from memononen/master
Smoother mouse wheel scrolling
2014-11-30 12:25:21 +00:00
ocornut
a31e44b99a Fixed Clang -Weverything warnings + TODO list entries 2014-11-30 12:21:50 +00:00
Mikko Mononen
eb789c0288 Smoother scrolling
- changed IO.MouseWheel to float, allows smoother scrolling
2014-11-30 12:20:25 +02:00
ocornut
e9aead09cb Remove unneeded extra parameter from ImFont::FindGlyph() 2014-11-29 00:04:05 +00:00
ocornut
e4a79e9fc8 Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale) 2014-11-29 00:02:46 +00:00
ocornut
311a2f8328 New version of IMGUI_ONCE_UPON_A_FRAME helper macro 2014-11-28 23:08:45 +00:00
ocornut
df2ad5e899 Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef 2014-11-28 22:38:41 +00:00
ocornut
07a6ba8aaf Merge branch 'master' of https://github.com/ocornut/imgui 2014-11-28 22:29:07 +00:00
ocornut
16d6561aba Increased visibility of check box and radio button with smaller size. + comments 2014-11-28 21:53:31 +00:00
omar
abe45e9976 Moved API Breaking Changes section of the documentation above the programmer's FAQ. 2014-11-26 22:27:48 +00:00
omar
c0999495e7 Fixed move-by-word in InputText() - broken 2 days ago, sorry. stb_ expect a define. 2014-11-26 22:19:46 +00:00
omar
b9118750ae Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers 2014-11-26 22:16:38 +00:00
ocornut
ec4b510775 Minor tidying & comments 2014-11-24 10:02:39 +00:00
ocornut
1484799b18 Console example: fixing losing text selection when using TAB completion with no match 2014-11-23 23:50:23 +00:00
ocornut
895f93f694 Remove unused variables 2014-11-23 23:36:54 +00:00
ocornut
49defcf083 InputText support for completion/history/custom callback + added fancy completion example in the console demo app
Unfortunately quite messy because of the UTF-8 <> wchar confusion going
around. Not well tested for UTF-8 compliance with non-Ascii characters.
2014-11-23 23:35:26 +00:00
omar
e78c47961e Not word-wrapping on apostrophes 2014-11-21 16:35:35 +00:00
omar
8c4fcf1359 Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first. 2014-11-21 16:29:56 +00:00
omar
2322318cac PopStyleVar() fix. OOPS 2014-11-21 14:19:26 +00:00
omar
5f8175abaa Version number 2014-11-21 13:40:38 +00:00
omar
075fe0220e MouseWheel input is normalized 2014-11-21 13:24:57 +00:00
omar
cf037b4769 PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar 2014-11-21 13:23:22 +00:00
ocornut
3572b04c69 ShowTestWindow: fixed example app from not displaying when header is collaposed. 2014-11-20 11:54:13 +00:00
ocornut
fd8752df8d Style editor: colors list inside a scrolling region 2014-11-20 11:33:40 +00:00
ocornut
f1dcd72e9f General fixes of Columns() api. User has more flexibility in the way to fill cells. 2014-11-20 11:31:55 +00:00
ocornut
2aee4419e3 Fixed compatibility with std::vector if user decide to #define ImVector 2014-11-20 08:15:21 +00:00
ocornut
9f2545e6bb Fixed comment 2014-11-18 10:01:34 +00:00
ocornut
f3bd033b6d More fixes for ultra pedantic Clang -Weverything 2014-11-18 09:55:31 +00:00
ocornut
b15532345b Using sqrtf, cosf, sinf. Made STB_TEXTEDIT_ implemtations static. Tweaks. 2014-11-18 07:51:55 +00:00
Daniel Collin
428c4d4ece Fixed Clang warnings 2014-11-17 20:35:58 +01:00
omar
172ff0a262 Commenting unnecessary strlen calls that could be removed for speedup 2014-11-17 02:27:26 +09:00
ocornut
3f85fe2fe7 Cleanup and TODO list items 2014-11-15 12:00:35 +00:00
ocornut
447cc88e04 Fixed unaligned memory access - fix font loading when building on Emscripten 2014-11-15 11:41:03 +00:00
omar
9c707b6d8f Added assert to catch font data loading failure in a location that's easier to understand 2014-11-14 11:22:35 +09:00
omar
9b5493d1d9 Added assert to catch users using Begin/End without a first NewFrame 2014-11-14 11:17:59 +09:00
omar
8a65d97bf0 Warning fixes (now testing with Clang) 2014-11-12 16:56:42 +09:00
Yaroslav Bunyak
7961c53145 Fix namespaces for Value() and Color() functions. 2014-11-12 01:36:34 +02:00
omar
d3bc92a674 Added INDEX to top of imgui.cpp
Explicit namespace prefix on all ImGui:: functions.
Fixed some typos.
2014-11-10 10:29:01 +09:00
omar
c97636aef4 Fixed lines clockwiseness to be consistent with other primitives. 2014-11-10 09:36:01 +09:00
omar
ee3355fe8e Version number 2014-11-07 17:43:00 +09:00
omar
1e30400f80 Added PushStyleVar(),PopStyleVar() helpers.
BeginChild() allows to specify negative sizes to specify "use remaining minus xx".
Added a simple example console into the demo window.
2014-11-07 17:22:38 +09:00
omar
3a64c77826 Renamed IsHovered() to IsItemHovered() 2014-11-07 15:49:14 +09:00
omar
6c192f3221 Added GetContentRegionMax() supporting columns. Some bug fixes with using columns. 2014-11-07 15:17:04 +09:00
omar
78645a7dba Added word-wrapping API TextWrapped(), PushTextWrapPos(), PopTextWrapPos()
Added word-wrapping sample in the test window.
Added IsItemFocused() to tell if last widget is being focused for keyboard input.
2014-11-07 14:45:56 +09:00
ocornut
74363c5a43 Fixed column using a "funny scale factor" (non power of two) #67 2014-10-26 21:33:34 +00:00
ocornut
0b10cf4bd7 Fixed some typos in comments 2014-10-26 21:31:34 +00:00
ocornut
3d84858755 Made with the NoResize flag can still use auto-fitting. Added SetWindowSize(). 2014-10-26 20:07:15 +00:00
ocornut
fad5e45d2c Minor tweaks 2014-10-26 19:56:57 +00:00
Jarrett Billingsley
85eee4a4c5 Added overloads of ImGui::PlotLines and ImGui::PlotHistogram which take a value getter function instead of raw value data, and changed the implementation of the original overloads to use this new implementation. 2014-10-26 12:25:00 -07:00
ocornut
f768579377 GCC warning fix 2014-10-26 18:57:19 +00:00
ocornut
e6eafd6fa8 Fixed warnings for GCC -Wpedantic 2014-10-26 15:08:28 +00:00
omar
1037bacc4b Version number 2014-10-25 11:15:28 +01:00
omar
af37fb1ee7 Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback 2014-10-25 11:00:24 +01:00
ocornut
9f05a2bb16 Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin) 2014-10-07 12:15:59 +01:00
ocornut
48a944813c Moved UserData 2014-10-05 09:11:02 +01:00
ocornut
1d9a4748de Added a UserData void *pointer so that the callback functions can access user state
"Just in case a project has adverse reactions to adding globals or
statics in their own code."
2014-10-05 09:08:57 +01:00
Sean Middleditch
bebadb9012 64-bit fixes
`int` values are not the same thing as `size_t` nor `ptrdiff_t`. Convert incorrect uses of `int` to more appropriate types.

Fixes warnings for 64-bit compilations.
2014-10-03 20:24:04 -07:00
ocornut
530e746daa Renamed IMGUI_INCLUDE_IMGUI_USER_CPP to IMGUI_INCLUDE_IMGUI_USER_INL (more IDE friendly) 2014-10-02 11:56:40 +01:00
ocornut
ce481ec702 SetKeyboardFocusHere() allow for an offset to access sub components + comments 2014-09-30 12:31:35 +01:00
ocornut
f1ea630dd0 SetKeyboardFocusHere() sets focus on next widget instead of previous + works on tabbing-disabled widgets 2014-09-30 12:22:58 +01:00
ocornut
ffc8264e9d Added SetKeyboardFocusHere() to set focus from code. Fixed tabbing through tab-disabled fields. 2014-09-30 11:57:37 +01:00
ocornut
0fa3d6e25f Version number and font documentation 2014-09-26 01:20:56 +01:00
ocornut
f898e658bb Added IO.FontFallbackGlyph (default to '?') + UTF-8 test in demo window 2014-09-26 01:06:27 +01:00
ocornut
b6ac371496 Warning fix 2014-09-25 20:55:48 +01:00
ocornut
81b9480413 Speculative warning fixes 2014-09-25 20:08:08 +01:00
ocornut
b86505bf2f Support for international text input in UTF-8. Added ImeSetInputScreenPosFn(). Removed text_end parameter from SetClipboardTextF 2014-09-25 14:51:06 +01:00
ocornut
d35ceb793e OpenGL example: added commented code to load custom font from filesystem 2014-09-25 11:35:23 +01:00
ocornut
51bbe1d961 Handle UTF-8 decoding for rendering and text size calculation 2014-09-25 11:29:59 +01:00
ocornut
a1162ac001 Tab to spaces 2014-09-24 20:39:39 +01:00
ocornut
618a42acf8 Renamed section in documentation 2014-09-24 19:35:34 +01:00
ocornut
3cd1b8a37b Update version number in sources 2014-09-24 19:34:03 +01:00
ocornut
746951691a Added va_list variations of all functions taking ... parameters (from Andrea Pessino) 2014-09-24 19:27:29 +01:00
ocornut
fec4232c79 Moved IM_MALLOC/IM_FREE/etc. to IO structure members one can set at runtime. 2014-09-24 18:01:07 +01:00
ocornut
85672fec2e Added IsPosHoveringAnyWindow() 2014-09-24 15:49:15 +01:00
ocornut
d5ed586d70 Added IsMouseHoveringWindow(), IsMouseHoveringAnyWindow() 2014-09-24 15:38:29 +01:00
ocornut
6e039c8b7d Doc formatting + adding 'API changes' section 2014-09-24 14:06:34 +01:00
ocornut
05a42ba3a6 Added IO.FontBaseScale for global rescale. Renamed SetFontScale to SetWindowFontScale 2014-09-24 14:03:42 +01:00
ocornut
24028911e3 Added version number in sources 2014-09-10 12:26:12 +01:00
ocornut
3fd68c3a31 Fixed file-descriptor leak if ImBitmapFont::LoadFromFile() calls to seek/tell fails. 2014-09-10 12:21:38 +01:00
ocornut
2e85dce1ee Added #define IMGUI_INCLUDE_IMGUI_USER_CPP to optionally include imgui_user.cpp 2014-09-10 11:22:01 +01:00
ocornut
62d233aaab Added extra_flags parameters to InputInt(), InputFloat(). Used in example code. Commented out broken ImGuiInputTextFlags_AlignCenter. 2014-09-08 16:50:09 +01:00
Thomas Buck
7439df0ba1 Added ImGuiInputTextFlags_EnterReturnsTrue 2014-09-08 15:48:39 +02:00
ocornut
ad42787543 Made radio button render ascii when logged into tty/file/clipboard 2014-09-02 14:36:03 +01:00
ocornut
91059da1a5 Added more comments in the code. 2014-09-02 14:35:06 +01:00
ocornut
c07ab1b56a Minor tweaks to "Memory override" pull request 2014-08-31 12:02:22 +01:00
Sepehr Taghdisian
25080d53e5 Memory override #3 2014-08-31 14:58:21 +04:30
ocornut
43448d9c89 Added FAQ/comments 2014-08-31 08:23:55 +01:00
ocornut
3b339efeb2 Added IO.FontYOffset. Added asserts. 2014-08-30 20:02:10 +01:00
ocornut
8fc50f5ed3 Remove IO.FontHeight, cached automatically. Added assertions. 2014-08-30 18:43:26 +01:00
ocornut
dd5d251273 Added SetCursorPosX, SetCursorPosY shortcuts 2014-08-29 13:36:31 +01:00
ocornut
2fb63b6068 Checkbox() return true when pressed 2014-08-28 17:32:03 +01:00
ocornut
7adad71042 Moved IMGUI_FONT_TEX_UV_FOR_WHITE define to a variable so font can be changed at runtime 2014-08-28 14:53:41 +01:00
ocornut
88c33ecc29 Fixes to allow clean 1-pixel thick lines in more use cases. PixelCenterOffset not the same as previously! 2014-08-28 14:52:10 +01:00
ocornut
1f63e01cc6 Minor fixes to scrollbar rendering, close button and made checkbox/radio button padding more consistent. 2014-08-27 22:16:55 +01:00
ocornut
bd26de0628 Collapse triangle don't have a shadow unless borders are enabled.
Fixed cross that appears when hovering window close button to be perfectly 45 degrees.
2014-08-27 17:54:11 +01:00
ocornut
5a9639b423 Fixed collapsing header border (if borders are enabled) being off the clip rectangle.
Tweak demo window.
2014-08-27 11:38:26 +01:00
ocornut
80dd1e1065 Added comments 2014-08-26 18:27:10 +01:00
ocornut
5f6b261c9b Fixed uninitialised fields in ImBitmapFont (were unused when uninitialised, but still dodgy) 2014-08-26 18:14:04 +01:00
ocornut
681ac5f777 Fixed size/padding of slider grab box for vertical symetry (was 1 pixel too high) 2014-08-26 16:56:20 +01:00
Martin Ettl
addfa75eb0 Do not update a variable, which is not used. 2014-08-24 07:32:27 +02:00
ocornut
d2b43f31e3 Updated URL to new ProggyFonts site 2014-08-25 17:27:42 +01:00
ocornut
d17a586738 Fixed ImGuiTextFilter triming of leading/trailing blanks. Documented "Filtering" section of demo better. 2014-08-25 17:19:04 +01:00
Martin Ettl
882072cf30 Fixed resource leaks 2014-08-24 03:51:00 +02:00
ocornut
6062d18cf9 Added basic sizes edition in the style editor 2014-08-20 17:42:53 +01:00
ocornut
6dd2b13220 Merge branch 'Dadeos-compilation_warnings' 2014-08-20 10:41:06 +01:00
ocornut
5864c45fe3 Fix type conversion compiler warnings (from dadeos) 2014-08-20 10:40:31 +01:00
ocornut
4bc3642bdb Todo list 2014-08-20 10:19:05 +01:00
ocornut
a3f32381c4 Fix mismatched static declaration warning 2014-08-19 12:51:13 +01:00
ocornut
67f17a644c Converted all Tabs to Spaces
Argh
2014-08-19 12:45:34 +01:00
ocornut
e807d97089 Exposed CalcTextSize(), GetCursorScreenPos() for more advanced fiddling 2014-08-19 12:39:30 +01:00