bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
1065a7b95b
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
7 years ago
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
7 years ago
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
7 years ago
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )
7 years ago
d970957e2d
ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)
7 years ago
4a7e1ff4d4
ImFontAtlas: Some shallow renaming + added an assert for clarification
7 years ago
0be4f66d89
ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618 )
7 years ago
9239e91dc9
Whitespace fix to previous
7 years ago
718f00d651
Make font atlas packing padding configurable
7 years ago
7b7845d764
ImFont::CalcWordWrapPositionA: minor optimization
7 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
7 years ago
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
7 years ago
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
7 years ago
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
7 years ago
e63ebd997f
Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
7 years ago
df56879883
imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
7 years ago
1987e23ce5
ImDrawList::PrimReserve() minor renaming of locals to make things clearer
7 years ago
afae9398cb
Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
7 years ago
12d265fa31
Version 1.51 WIP tag
7 years ago
a2f7c40e30
Fixed comment ( #1178 )
7 years ago
5e1caaaef3
Version 1.50
7 years ago
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
7 years ago
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
7 years ago
0828a1fd6c
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
8 years ago
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
8 years ago
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
8 years ago
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
8 years ago
670775ac22
Added assert/comment about using MergeMode ( #1100 )
8 years ago
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
8 years ago
b84eac53d8
ImFont: Reorder field initialization to match declaration order
8 years ago
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
8 years ago
68df09cf47
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
8 years ago
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
8 years ago
8553bab241
Ignoring overzealous GCC warnings ( #883 )
8 years ago
620497e466
Font: Font name include size
8 years ago
b2f0ea6c0d
Font: Default font given explicit name "ProggyClean.ttf"
8 years ago
907dd2ed20
Comments ( #896 )
8 years ago
d567595dde
ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions
8 years ago
e07d45709f
ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing ( #844 )
8 years ago
1d7e05327b
Fix clang warning: unknown warning group '-Wreserved-id-macro'
8 years ago
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
8 years ago
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
8 years ago
35c6fd682f
Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder ( #839 )
8 years ago
87d99fce6b
ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df)
8 years ago
5a47346f5a
ImFont: add RenderGlyph() to allow rendering of individual glyphs
8 years ago
8efd05a148
Tab->Spaces, missing spaces, typos
8 years ago
4141144b21
Added GetGlyphRangesThai()
8 years ago
4961b2ea18
Speculative build fix for FreeBSD+GLIBC configuration
...
See
a1f9b62dd0
8 years ago
d79186931e
ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command
8 years ago
omar
James Wallis
omar
Peter
Geoffrey Tucker
Jeongseok Lee
Michał Cichoń
Brian Swetland
Adisorn Aeksatean