359 Commits (c487bc52a2790f54cc53c0f8d5138ac7e30bad2d)

Author SHA1 Message Date
omar 6f1f5cbc20 Version 1.61 WIP 7 years ago
omar 54fca1d1b8 Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fca94) (#1733, ~#1731) + assert 7 years ago
omar 3a29ddbcfa Version 1.60 7 years ago
omar 82b7a39f31 Fixed a few zealous warnings. 7 years ago
omar 1e116e6c17 Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik. 7 years ago
omar 78610a54d2 Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now. 7 years ago
omar fe5347ef94 imconfig: Added IMGUI_STB_TRUETYPE_FILENAME, IMGUI_STB_RECT_PACK_FILENAME + documenting IMGUI_DISABLE_STB_XXX flags and hiding IMGUI_STB_NAMESPACE which is misleading.
Fixed typos in todo list.
7 years ago
omar 1e296453ef ImDrawList: Added Clone() helper function. 7 years ago
omar 533c86a7a3 Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows. 7 years ago
omar e7670c0bcc Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707) 7 years ago
omar 1f6ad7a894 ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d 7 years ago
omar a3d5f92214 Merge branch 'master' into font_offset 7 years ago
omar 1ef1acbd8d Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5) 7 years ago
omar 3dfac93ebe Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well. 7 years ago
omar 945f4d1ecd Removed redundant semi colons. (#1653) 7 years ago
omar 0ec356eb6e Comments, FAQ update. 7 years ago
omar 69e700f869 Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added 7 years ago
omar 403b2d7d59 ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). (#1646) 7 years ago
omar 79969931e6 ImDrawList: PushTextureID(): Removed unnecessary param by reference. 7 years ago
omar 7c75835200 Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626) 7 years ago
omar c433bbcd8e ImFont: stb_truetype now rounding Ascent/Descent the same way as freetype does, they seem to vertically align better this way. 7 years ago
omar 30c469f7c5 ImFont: DisplayOffset.y defaults to 0 instead of +1. 7 years ago
omar 024e23c4d7 Comments, moved ImFontAtlas::Flags to "public" area. 7 years ago
omar fed0a884f7 ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. (#1613) 7 years ago
omar 6bc3e7b043 ImFontAtlas: if stbtt_PackBegin() because of failing allocation we return a little more nicely. (keeps Coverity static analyzer happy!) 7 years ago
omar 88dcbeb7ff Styles: Comments and re-ordered. 7 years ago
omar 7c16d52f72 Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787) 7 years ago
omar 47e81a6194 Merge branch 'master' into navigation 7 years ago
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago
omar ed088b00be Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707) 7 years ago
omar 9edf211c0e Merge branch 'master' into navigation 7 years ago
omar 5eb293c879 ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight) 7 years ago
omar cd1409f4bf ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939) 7 years ago
omar 66b2ee6ea2 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar ecbfdd3143 Added extraneous initialization to NULL. (#1527). 7 years ago
omar 96ccc484f9 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
Branimir Karadžić 856ee17ed8 Fixed Android clang warning. 7 years ago
omar 7e03ee8d85 Merge branch 'master' into navigation 7 years ago
omar 4af84ac781 ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527) 7 years ago
omar c4e6d622c1 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar 49eed6e2d1 Version 1.54 WIP 7 years ago
omar 436cad4bca Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
7 years ago
omar e916310b2e Version 1.53 7 years ago
omar de5c304b49 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar cead207535 Comments 7 years ago
omar ffb4f6ca8c Merge branch 'master' into navigation 7 years ago
omar d976e4ea23 Internals: Missing IM_DELETE usage (#1517) 7 years ago
omar 9cda86d55a Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504) 7 years ago
omar 983d8f5f8e Various zealous warning fixes (Clang). 7 years ago
omar 1f26652944 Various zealous warning fixes (thanks Clang). 7 years ago
omar 287380261c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore. 7 years ago
omar 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
omar 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
omar fa9327ccf8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
7 years ago
omar e98df91dc4 Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707) 7 years ago
omar 38bfdb357e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar 6d93011fdf alloca fix to allow Clang with Microsoft CodeGen path 7 years ago
omar 364251146b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar aea3fe41b9 Style: Tweaks Dark and Light styles. (#707) 7 years ago
omar f5c47faee8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
Giuseppe Barbieri 1b2ec35b8d
Update imgui_draw.cpp 7 years ago
omar 2543807e56 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
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). 7 years ago
omar 31683cfe34 ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845) 7 years ago
thedmd 79f07f6ff0 Add AddImageRounded() to ImDrawList 7 years ago
thedmd 8b2d449b16 Add ShadeVertsLinearUV() 7 years ago
omar 9848a7023b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
7 years ago
omar f7fe824805 Style: Tweaked border settings to homogenize a little how they look over different backgrounds. (#707) 7 years ago
omar 39137ccc3e Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. (#707) 7 years ago
Jason Wilkins 022f8c2342 fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph 7 years ago
omar 9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
ImFontAtlas: Fix maybe-uninitialized warning.
7 years ago
omar d323e8cca2 Fixed Style merge for nav branch (#707, #787) 7 years ago
omar d211a0e338 Merge branch 'master' into navigation (with style breakable)
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
7 years ago
omar 0e4f1df1a4 Style: Made changes to Classic style (!!!). Tweaked Dark style. (#707) 7 years ago
omar 0a61b7195c Style: Added a default StyleColorsLight(). (#707) 7 years ago
omar 58345b11e1 Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. (#707) 7 years ago
omar 331eac511e Style: Dark: Tweaks + setting BorderShadow correctly. 7 years ago
Francisco Demartino f5871c0b92 fix uninitialized atlas packing context 7 years ago
omar 6817f3a3d9 Merge branch 'master' into navigation 7 years ago
omar f5bdf443c9 Minor comments, tweaks 7 years ago
omar 0d4c320f88 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
7 years ago
omar 2a3a25e792 Reordered fields in other Style functions (#1409) 7 years ago
Giuseppe Barbieri db190c16f6
Update imgui_draw.cpp 7 years ago
omar 63f6f2dd13 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar 53f9e28c77 GetGlyphRangesThai(): removed extraneous codepoints (#1396) 7 years ago
Adisorn Aeksatean 3185a3a697
Add missing thai punctuations 7 years ago
omar d55b69ad6e Styles: Nav tweaks. 7 years ago
omar edafbcd630 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar c503a50cff Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function. 7 years ago
omar 77df1ba9e0 Version 1.53 WIP 7 years ago
omar 9f200d10d5 Version 1.52 7 years ago
omar bc447bc0a4 ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. (#1391) 7 years ago
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) 7 years ago
omar 08e411c310 Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font 7 years ago
omar 5b699517d4 Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits) 7 years ago
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) 7 years ago
Dominik Tugend 7a8eb5bdc9 Rendering issue fix
Fixes ocornut/imgui#1172
7 years ago
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.
7 years ago
omar 09f6f564d9 ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart 7 years ago
omar 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
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. 7 years ago
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. 7 years ago
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) 7 years ago
omar 2170b0b278 ImFontAtlas: Comments and minor reorganization of declaration in header file. 7 years ago
omar 529ca279a4 ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use) 7 years ago
omar ba12d37719 Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
FIxes zealous Clang warning.
7 years ago
omar 709653c330 Merge branch 'master' into styles 7 years ago
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.
7 years ago
omar 65632d2682 Fixed alloca include for SunOS (#1319) 7 years ago
Daniel Loffgren cf6ba9dd2d Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h 7 years ago
omar 0ba3cadb88 RenderRectFilledRangeH() can't use cheap acosf() approximation for now. (#1296) 7 years ago
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) 7 years ago
omar f0fa17b5e0 ImDrawList: Minor renaming 7 years ago
omar 808d631e35 imDrawList: PathArcTo() returns when passed zero radius. 7 years ago
omar e1d81f4dc5 ImDrawList: Minor tidying up. 7 years ago
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums. 7 years ago
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) 7 years ago
omar 304de0ee1b ImFontConfig: Comments, const. 7 years ago
omar 40f608ce9b Version 1.52 WIP 7 years ago
omar 55a6209931 Version 1.51 7 years ago
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended) 7 years ago
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 7 years ago
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 7 years ago
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618) 7 years ago
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) 7 years ago
omar 24a78767d2 Merge branch 'master' into styles
# Conflicts:
#	TODO.txt
7 years ago
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification 7 years ago
omar 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
James Wallis 9239e91dc9 Whitespace fix to previous 7 years ago
James Wallis 718f00d651 Make font atlas packing padding configurable 7 years ago
omar 18b50f8eba Comments 7 years ago
omar f8f382221c ImVector: added resize() variant with initialization value 7 years ago
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization 7 years ago
omar d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() 7 years ago
omar d2c219df84 Merge pull request #826 from swetland/patch
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
7 years ago
omar 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments. 7 years ago
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc 7 years ago
omar e63ebd997f Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0) 7 years ago
omar df56879883 imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point. 7 years ago
omar 1987e23ce5 ImDrawList::PrimReserve() minor renaming of locals to make things clearer 7 years ago
omar afae9398cb Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place. 7 years ago
omar 12d265fa31 Version 1.51 WIP tag 7 years ago
omar a2f7c40e30 Fixed comment (#1178) 7 years ago
omar 5e1caaaef3 Version 1.50 7 years ago
omar 9da53bcecd ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change) 7 years ago
omar c5c77a3476 ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon. 7 years ago
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account 8 years ago
omar a0a6c8a2ef Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API) 8 years ago