856ee17ed8
Fixed Android clang warning.
7 years ago
7e03ee8d85
Merge branch 'master' into navigation
7 years ago
4af84ac781
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. ( #1527 )
7 years ago
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
e916310b2e
Version 1.53
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
cead207535
Comments
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
d976e4ea23
Internals: Missing IM_DELETE usage ( #1517 )
7 years ago
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
7 years ago
983d8f5f8e
Various zealous warning fixes (Clang).
7 years ago
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
7 years ago
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
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
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
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
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
18b50f8eba
Comments
7 years ago
f8f382221c
ImVector: added resize() variant with initialization value
7 years ago
7b7845d764
ImFont::CalcWordWrapPositionA: minor optimization
7 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
7 years ago
Branimir Karadžić
omar
Giuseppe Barbieri
thedmd
Jason Wilkins
omar
Francisco Demartino
Adisorn Aeksatean
Dominik Tugend
Anthony Pesch
Bruce Mitchener
Daniel Loffgren
James Wallis