Commit Graph

253 Commits (664ab85f76d59023684e077ea5654bbaeea3abc0)

Author SHA1 Message Date
omar 38bfdb357e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 6d93011fdf alloca fix to allow Clang with Microsoft CodeGen path
omar 364251146b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar aea3fe41b9 Style: Tweaks Dark and Light styles. ()
omar f5c47faee8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
Giuseppe Barbieri 1b2ec35b8d
Update imgui_draw.cpp
omar 2543807e56 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 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).
omar 31683cfe34 ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ()
thedmd 79f07f6ff0 Add AddImageRounded() to ImDrawList
thedmd 8b2d449b16 Add ShadeVertsLinearUV()
omar 9848a7023b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
omar f7fe824805 Style: Tweaked border settings to homogenize a little how they look over different backgrounds. ()
omar 39137ccc3e Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ()
Jason Wilkins 022f8c2342 fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
omar 9289e8055c
Merge pull request from franciscod/uninitialized_o3_werror
ImFontAtlas: Fix maybe-uninitialized warning.
omar d323e8cca2 Fixed Style merge for nav branch (, )
omar d211a0e338 Merge branch 'master' into navigation (with style breakable)
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
omar 0e4f1df1a4 Style: Made changes to Classic style (!!!). Tweaked Dark style. ()
omar 0a61b7195c Style: Added a default StyleColorsLight(). ()
omar 58345b11e1 Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ()
omar 331eac511e Style: Dark: Tweaks + setting BorderShadow correctly.
Francisco Demartino f5871c0b92 fix uninitialized atlas packing context
omar 6817f3a3d9 Merge branch 'master' into navigation
omar f5bdf443c9 Minor comments, tweaks
omar 0d4c320f88 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
omar 2a3a25e792 Reordered fields in other Style functions ()
Giuseppe Barbieri db190c16f6
Update imgui_draw.cpp
omar 63f6f2dd13 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 53f9e28c77 GetGlyphRangesThai(): removed extraneous codepoints ()
Adisorn Aeksatean 3185a3a697
Add missing thai punctuations
omar d55b69ad6e Styles: Nav tweaks.
omar edafbcd630 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar c503a50cff Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
omar 77df1ba9e0 Version 1.53 WIP
omar 9f200d10d5 Version 1.52
omar bc447bc0a4 ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ()
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. ()
omar 08e411c310 Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
omar 5b699517d4 Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
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. (, )
Dominik Tugend 7a8eb5bdc9 Rendering issue fix
Fixes 
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.
omar 09f6f564d9 ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
omar 3fe2ecfd4c ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
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.
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.
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)
omar 2170b0b278 ImFontAtlas: Comments and minor reorganization of declaration in header file.
omar 529ca279a4 ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
omar ba12d37719 Merge pull request from waywardmonkeys/improve-clang-warnings
FIxes zealous Clang warning.
omar 709653c330 Merge branch 'master' into styles
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.
omar 65632d2682 Fixed alloca include for SunOS ()
Daniel Loffgren cf6ba9dd2d Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
omar 0ba3cadb88 RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ()
omar 01d4bf299a Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (, )
omar f0fa17b5e0 ImDrawList: Minor renaming
omar 808d631e35 imDrawList: PathArcTo() returns when passed zero radius.
omar e1d81f4dc5 ImDrawList: Minor tidying up.
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums.
omar 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)
omar 304de0ee1b ImFontConfig: Comments, const.
omar 40f608ce9b Version 1.52 WIP
omar 55a6209931 Version 1.51
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ()
omar 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)
omar 24a78767d2 Merge branch 'master' into styles
# Conflicts:
#	TODO.txt
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification
omar 0be4f66d89 ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like )
James Wallis 9239e91dc9 Whitespace fix to previous
James Wallis 718f00d651 Make font atlas packing padding configurable
omar 18b50f8eba Comments
omar f8f382221c ImVector: added resize() variant with initialization value
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization
omar d258287c92 Revert d2c219d + tidying up ImFont::RenderChar()
omar d2c219df84 Merge pull request from swetland/patch
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
omar 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments.
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc
omar e63ebd997f Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
omar df56879883 imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
omar 1987e23ce5 ImDrawList::PrimReserve() minor renaming of locals to make things clearer
omar afae9398cb Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
omar 12d265fa31 Version 1.51 WIP tag
omar a2f7c40e30 Fixed comment ()
omar 5e1caaaef3 Version 1.50
omar 9da53bcecd ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
omar c5c77a3476 ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
omar a0a6c8a2ef Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
omar 6517d68cdf ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ()
Peter 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.
omar 670775ac22 Added assert/comment about using MergeMode ()
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is.
omar b84eac53d8 ImFont: Reorder field initialization to match declaration order
omar b8043d3ee5 Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ()