omar
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-11-19 16:21:21 +01:00
omar
f7fe824805
Style: Tweaked border settings to homogenize a little how they look over different backgrounds. ( #707 )
2017-11-19 13:55:38 +01:00
omar
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
2017-11-19 13:52:40 +01:00
Jason Wilkins
022f8c2342
fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
2017-11-19 12:44:23 +01:00
omar
9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
...
ImFontAtlas: Fix maybe-uninitialized warning.
2017-11-19 00:53:35 +01:00
omar
d323e8cca2
Fixed Style merge for nav branch ( #707 , #787 )
2017-11-19 00:47:00 +01:00
omar
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
2017-11-19 00:39:37 +01:00
omar
0e4f1df1a4
Style: Made changes to Classic style (!!!). Tweaked Dark style. ( #707 )
2017-11-19 00:29:29 +01:00
omar
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
2017-11-19 00:29:29 +01:00
omar
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
2017-11-18 23:44:16 +01:00
omar
331eac511e
Style: Dark: Tweaks + setting BorderShadow correctly.
2017-11-18 19:08:52 +01:00
Francisco Demartino
f5871c0b92
fix uninitialized atlas packing context
2017-11-16 21:45:21 -03:00
omar
6817f3a3d9
Merge branch 'master' into navigation
2017-11-15 23:44:50 +01:00
omar
f5bdf443c9
Minor comments, tweaks
2017-11-15 22:37:43 +01:00
omar
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2017-11-06 23:58:28 +01:00
omar
2a3a25e792
Reordered fields in other Style functions ( #1409 )
2017-11-02 10:41:21 +01:00
Giuseppe Barbieri
db190c16f6
Update imgui_draw.cpp
2017-11-01 16:48:56 +01:00
omar
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-11-01 15:09:23 +01:00
omar
53f9e28c77
GetGlyphRangesThai(): removed extraneous codepoints ( #1396 )
2017-10-29 11:28:29 +01:00
Adisorn Aeksatean
3185a3a697
Add missing thai punctuations
2017-10-28 16:59:39 +07:00
omar
d55b69ad6e
Styles: Nav tweaks.
2017-10-27 20:06:45 +02:00
omar
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-10-27 20:04:51 +02:00
omar
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
2017-10-27 20:01:30 +02:00
omar
77df1ba9e0
Version 1.53 WIP
2017-10-27 19:54:56 +02:00
omar
9f200d10d5
Version 1.52
2017-10-27 17:10:41 +02:00
omar
bc447bc0a4
ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ( #1391 )
2017-10-24 16:08:05 +02:00
omar
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 )
2017-10-22 10:24:56 +02:00
omar
08e411c310
Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
2017-10-22 10:17:28 +02:00
omar
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
2017-10-19 19:42:19 +02:00
omar
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 )
2017-10-15 21:07:22 +02:00
Dominik Tugend
7a8eb5bdc9
Rendering issue fix
...
Fixes ocornut/imgui#1172
2017-10-15 19:27:53 +02:00
Anthony Pesch
c38526d14b
Completely clear font when rebuilding atlas.
...
Previously, IndexLookup was not cleared on each font, causing FindGlyph to return old glyphs when using MergeMode.
2017-10-01 23:40:29 -04:00
omar
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
2017-09-27 11:21:42 +02:00
omar
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
2017-09-26 20:24:27 +02:00
omar
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.
2017-09-26 20:05:16 +02:00
omar
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.
2017-09-26 19:54:30 +02:00
omar
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)
2017-09-26 19:26:16 +02:00
omar
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
2017-09-26 19:10:29 +02:00
omar
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
2017-09-26 18:41:21 +02:00
omar
ba12d37719
Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
...
FIxes zealous Clang warning.
2017-09-19 18:18:53 +02:00
omar
709653c330
Merge branch 'master' into styles
2017-09-18 15:03:25 +02:00
Bruce Mitchener
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.
2017-09-14 10:28:18 +07:00
omar
65632d2682
Fixed alloca include for SunOS ( #1319 )
2017-09-12 11:55:13 +02:00
Daniel Loffgren
cf6ba9dd2d
Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
2017-09-11 00:15:43 -07:00
omar
0ba3cadb88
RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ( #1296 )
2017-08-29 15:25:05 +08:00
omar
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 )
2017-08-29 15:22:30 +08:00
omar
f0fa17b5e0
ImDrawList: Minor renaming
2017-08-29 15:10:03 +08:00
omar
808d631e35
imDrawList: PathArcTo() returns when passed zero radius.
2017-08-28 16:02:25 +08:00
omar
e1d81f4dc5
ImDrawList: Minor tidying up.
2017-08-28 14:12:55 +08:00
omar
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
2017-08-28 14:11:11 +08:00
