omar
|
b87f9a19c8
|
Merge pull request #113 from ocornut/2015-01-truetype
Merge - TTF font loading, mulitple fonts, Image support
|
2015-01-18 12:27:32 +00:00 |
|
ocornut
|
7e2305eb36
|
Comments
|
2015-01-18 12:22:17 +00:00 |
|
ocornut
|
46fbff50cf
|
Documentation
|
2015-01-18 12:19:49 +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
|
edcf2d3bf6
|
Examples: more comments on loading fonts.
|
2015-01-18 11:38:14 +00:00 |
|
ocornut
|
8386e4fb7e
|
Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure.
|
2015-01-18 11:36:23 +00:00 |
|
ocornut
|
ed23598e49
|
Font documentation
|
2015-01-18 11:24:06 +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
|
43c8b5e0d2
|
Examples: DirectX11: use linear sampler to be in sync with other examples.
|
2015-01-17 16:52:21 +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
|
62ecdd21a5
|
Examples: Added a color slider for the background color + tweak first example use of button.s
|
2015-01-15 09:59:18 +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
|
4f6643cc0c
|
Fix missing glyph handling in modified stb_truetype.h (ttf branch)
|
2015-01-14 22:05:13 +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
|
e2d8c03e1a
|
Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
+ removed unnecessary destructor
|
2015-01-13 23:06:55 +00:00 |
|
ocornut
|
f0b493c217
|
Fixed style.WindowMinSize not honored properly.
|
2015-01-13 23:05:20 +00:00 |
|
ocornut
|
6c6d1746d4
|
Fix missing glyph handling in modified stb_truetype.h
|
2015-01-13 08:56:02 +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 |
|