6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
7 years ago
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
aea3fe41b9
Style: Tweaks Dark and Light styles. ( #707 )
7 years ago
f5c47faee8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
1b2ec35b8d
Update imgui_draw.cpp
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
7 years ago
31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
7 years ago
79f07f6ff0
Add AddImageRounded() to ImDrawList
7 years ago
8b2d449b16
Add ShadeVertsLinearUV()
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
f7fe824805
Style: Tweaked border settings to homogenize a little how they look over different backgrounds. ( #707 )
7 years ago
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
7 years ago
022f8c2342
fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
7 years ago
9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
...
ImFontAtlas: Fix maybe-uninitialized warning.
7 years ago
d323e8cca2
Fixed Style merge for nav branch ( #707 , #787 )
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
0e4f1df1a4
Style: Made changes to Classic style (!!!). Tweaked Dark style. ( #707 )
7 years ago
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
7 years ago
331eac511e
Style: Dark: Tweaks + setting BorderShadow correctly.
7 years ago
f5871c0b92
fix uninitialized atlas packing context
7 years ago
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
f5bdf443c9
Minor comments, tweaks
7 years ago
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
2a3a25e792
Reordered fields in other Style functions ( #1409 )
7 years ago
db190c16f6
Update imgui_draw.cpp
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
53f9e28c77
GetGlyphRangesThai(): removed extraneous codepoints ( #1396 )
7 years ago
3185a3a697
Add missing thai punctuations
7 years ago
d55b69ad6e
Styles: Nav tweaks.
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
9f200d10d5
Version 1.52
7 years ago
bc447bc0a4
ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ( #1391 )
7 years ago
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
7 years ago
08e411c310
Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
7 years ago
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
7 years ago
e32569dd5a
ImDrawList: Fixed a bug in ChannelsMerge() leading to an extraneous draw call being created, which unexpectly led to more dramatic condition but to faulty draw command merging code. ( #1172 , #1368 )
7 years ago
7a8eb5bdc9
Rendering issue fix
...
Fixes ocornut/imgui#1172
7 years ago
c38526d14b
Completely clear font when rebuilding atlas.
...
Previously, IndexLookup was not cleared on each font, causing FindGlyph to return old glyphs when using MergeMode.
7 years ago
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
7 years ago
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
7 years ago
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
7 years ago
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
7 years ago
072d6d8cb5
ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)
7 years ago
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
7 years ago
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
7 years ago
ba12d37719
Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
...
FIxes zealous Clang warning.
7 years ago
709653c330
Merge branch 'master' into styles
7 years ago
4c794be41d
Improve warning configuration for clang.
...
Clang 4.0 introduced -Wdouble-promotion, so check for and disable
that on clang as we do on gcc.
The old style casts warning is already disabled globally in this file
for clang, so it doesn't need to be re-disabled within this scope.
7 years ago
65632d2682
Fixed alloca include for SunOS ( #1319 )
7 years ago
cf6ba9dd2d
Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
7 years ago
0ba3cadb88
RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ( #1296 )
7 years ago
01d4bf299a
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. ( #1296 , #76 )
7 years ago
f0fa17b5e0
ImDrawList: Minor renaming
7 years ago
808d631e35
imDrawList: PathArcTo() returns when passed zero radius.
7 years ago
e1d81f4dc5
ImDrawList: Minor tidying up.
7 years ago
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
304de0ee1b
ImFontConfig: Comments, const.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
1065a7b95b
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
8 years ago
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )
8 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)
8 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
8 years ago
4a7e1ff4d4
ImFontAtlas: Some shallow renaming + added an assert for clarification
8 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 )
8 years ago
9239e91dc9
Whitespace fix to previous
8 years ago
718f00d651
Make font atlas packing padding configurable
8 years ago
18b50f8eba
Comments
8 years ago
f8f382221c
ImVector: added resize() variant with initialization value
8 years ago
7b7845d764
ImFont::CalcWordWrapPositionA: minor optimization
8 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
8 years ago
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
8 years ago
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
8 years ago
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
8 years ago
e63ebd997f
Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
8 years ago
df56879883
imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
8 years ago
1987e23ce5
ImDrawList::PrimReserve() minor renaming of locals to make things clearer
8 years ago
afae9398cb
Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
8 years ago
12d265fa31
Version 1.51 WIP tag
8 years ago
a2f7c40e30
Fixed comment ( #1178 )
8 years ago
5e1caaaef3
Version 1.50
8 years ago
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
8 years ago
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
8 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
9 years ago
4141144b21
Added GetGlyphRangesThai()
9 years ago
4961b2ea18
Speculative build fix for FreeBSD+GLIBC configuration
...
See
a1f9b62dd0
9 years ago
d79186931e
ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command
9 years ago
65a525550e
ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000)
9 years ago
5d4cf1c3f3
Version 1.50 WIP
9 years ago
adb85d800d
Version 1.49
9 years ago
b4302187dd
ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field.
9 years ago
a59a04f4d0
Fixed iOS/OSX build.
9 years ago
8af76d56b4
Merge pull request #639 from sergof/conversion-warnings
...
Ignore various anal GCC warnings.
9 years ago
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
9 years ago
6e8579fc14
Ignore implicit conversion warnings
9 years ago
f22b6e1e09
Fixed/silenced various absurd GCC warnings from outer space ( #626 )
9 years ago
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
9 years ago
7406d64c64
PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582 )
9 years ago
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
9 years ago
4b6e9ac396
ImFont: Added AddRemapChar() helper ( #609 )
9 years ago
727ca4bd17
ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes
9 years ago
a20d69f9ce
ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split
9 years ago
44fb99542f
ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead.
9 years ago
fe73a23cf5
ImFont: Added RenderChar() helper.
9 years ago
d92f1deff8
ImDrawList: Added AddQuad(), AddQuadFilled() helpers.
9 years ago
d5eb87d0a2
Fix font config propagation in FontFromMemoryCompressedTTF()
9 years ago
1588eda1ac
Version 1.49 WIP
9 years ago
95cbcdca3f
Version 1.48
9 years ago
39c9bb73e8
Merge pull request #563 from mneumann/fix_dragonfly
...
Fix compilation on DragonFly BSD
9 years ago
2b7eeba143
Trim trailing spaces
9 years ago
adb4d4d48b
Fix compilation on DragonFly BSD
9 years ago
5bed7144fe
ImDrawList: Added AddTriangle() function
9 years ago
9260d46c2c
Comments
9 years ago
b495a52fc0
ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default
9 years ago
928832a5bc
Various tidying up / comments, moved columns functions declarations, no functional changes
9 years ago
9cbc6e196b
ImDrawList: AddRect() added optional thickness parameter + updated demo
9 years ago
86fb3a6a3c
ImDrawList: AddCircle() takes optional thickness parameter
9 years ago
2efaa9a86f
ImDrawList: fixed index overflow check broken by AddText(). Added extra assert. ( #514 )
9 years ago
595684e08c
Remove dependency on <new> header ( #484 , #504 )
...
(Now expecting something to fail somewhere..)
9 years ago
b6fe5eb4b4
Cleaned up the top of imgui.h, documenting all types / forward declarations
9 years ago
omar
Giuseppe Barbieri
thedmd
Jason Wilkins
omar
Francisco Demartino
Adisorn Aeksatean
Dominik Tugend
Anthony Pesch
Bruce Mitchener
Daniel Loffgren
James Wallis
Peter
Geoffrey Tucker
Jeongseok Lee
Brian Swetland
Branimir Karadžić
Sergej Reich
Michael Neumann