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 |
|
Mikko Mononen
|
fdc8c0722f
|
Compile fixes
|
2015-01-06 19:24:57 +02:00 |
|
Mikko Mononen
|
91684a428b
|
Merge upstream
|
2015-01-06 19:15:41 +02:00 |
|
Mikko Mononen
|
d9757bb583
|
First pass on AA rendered primitives
|
2015-01-06 19:05:24 +02: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 |
|