365 Commits (f1f4b42d910eaa876231e0845af969e9c7daf311)

Author SHA1 Message Date
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
omar 6517d68cdf ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK (#1009) 8 years ago
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.
8 years ago
omar 670775ac22 Added assert/comment about using MergeMode (#1100) 8 years ago
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 8 years ago
omar b84eac53d8 ImFont: Reorder field initialization to match declaration order 8 years ago
omar b8043d3ee5 Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917) 8 years ago
ocornut 68df09cf47 Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse) 8 years ago
Geoffrey Tucker 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
ocornut 8553bab241 Ignoring overzealous GCC warnings (#883) 8 years ago
ocornut 620497e466 Font: Font name include size 8 years ago
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" 8 years ago
ocornut 907dd2ed20 Comments (#896) 8 years ago
ocornut d567595dde ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions 8 years ago
ocornut e07d45709f ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing (#844) 8 years ago
Jeongseok Lee 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro' 8 years ago
ocornut 68c81739bf Minor tidying up following merge BGRA color PR (#844) 8 years ago
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format. 8 years ago
ocornut 35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder (#839) 8 years ago
ocornut 87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df) 8 years ago
Brian Swetland 5a47346f5a ImFont: add RenderGlyph() to allow rendering of individual glyphs 8 years ago
ocornut 8efd05a148 Tab->Spaces, missing spaces, typos 8 years ago
Adisorn Aeksatean 4141144b21 Added GetGlyphRangesThai() 8 years ago
ocornut 4961b2ea18 Speculative build fix for FreeBSD+GLIBC configuration
See
a1f9b62dd0
8 years ago
ocornut d79186931e ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command 8 years ago
ocornut 65a525550e ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000) 8 years ago
ocornut 5d4cf1c3f3 Version 1.50 WIP 8 years ago
ocornut adb85d800d Version 1.49 8 years ago
ocornut 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
Branimir Karadžić a59a04f4d0 Fixed iOS/OSX build. 9 years ago
omar 8af76d56b4 Merge pull request #639 from sergof/conversion-warnings
Ignore various anal GCC warnings.
9 years ago
ocornut 8b428e8c74 Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269) 9 years ago
Sergej Reich 6e8579fc14 Ignore implicit conversion warnings 9 years ago
ocornut f22b6e1e09 Fixed/silenced various absurd GCC warnings from outer space (#626) 9 years ago
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings (#626) 9 years ago
ocornut 7406d64c64 PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582) 9 years ago
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610) 9 years ago
ocornut 4b6e9ac396 ImFont: Added AddRemapChar() helper (#609) 9 years ago
ocornut 727ca4bd17 ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes 9 years ago
ocornut a20d69f9ce ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split 9 years ago
ocornut 44fb99542f ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead. 9 years ago
ocornut fe73a23cf5 ImFont: Added RenderChar() helper. 9 years ago
ocornut d92f1deff8 ImDrawList: Added AddQuad(), AddQuadFilled() helpers. 9 years ago
Sergej Reich d5eb87d0a2 Fix font config propagation in FontFromMemoryCompressedTTF() 9 years ago
ocornut 1588eda1ac Version 1.49 WIP 9 years ago
ocornut 95cbcdca3f Version 1.48 9 years ago
omar 39c9bb73e8 Merge pull request #563 from mneumann/fix_dragonfly
Fix compilation on DragonFly BSD
9 years ago
ocornut 2b7eeba143 Trim trailing spaces 9 years ago
Michael Neumann adb4d4d48b Fix compilation on DragonFly BSD 9 years ago
ocornut 5bed7144fe ImDrawList: Added AddTriangle() function 9 years ago
ocornut 9260d46c2c Comments 9 years ago
ocornut b495a52fc0 ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default 9 years ago
ocornut 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes 9 years ago
ocornut 9cbc6e196b ImDrawList: AddRect() added optional thickness parameter + updated demo 9 years ago
ocornut 86fb3a6a3c ImDrawList: AddCircle() takes optional thickness parameter 9 years ago
ocornut 2efaa9a86f ImDrawList: fixed index overflow check broken by AddText(). Added extra assert. (#514) 9 years ago
ocornut 595684e08c Remove dependency on <new> header (#484, #504)
(Now expecting something to fail somewhere..)
9 years ago
ocornut b6fe5eb4b4 Cleaned up the top of imgui.h, documenting all types / forward declarations 9 years ago
ocornut a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments. 9 years ago
ocornut e585204d82 ImFontAtlas: heuristic increase texture width up to 4096 with 4000+ glyphs. Various comments (#491) 9 years ago
ocornut 76ca7c42ca ImDrawList: Added PrimQuadUV() helper to ease custom rendering of textured quads 9 years ago
ocornut d212401624 Fixed ImDrawList::AddRect() which used to render a rectangle 1 px too large on each axis., fixed Image(), ImageButton() as well (#457) 9 years ago
ocornut 6dbdc69131 ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457 9 years ago
ocornut dc4a07c49a Fixed various Clang -Weverything warnings 9 years ago
ocornut e41568f87f Version number 1.48 WIP + Update binaries 9 years ago
ocornut 24d186753e Version number 1.47 9 years ago
ocornut 2849596069 Comments about ImDrawList::PushClipRect 9 years ago
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" (#21) 9 years ago
ocornut 0b10bec71f ImDrawList: Simplified code and added check to avoid mis-recycling a callback command. 9 years ago
ocornut 0873da85ec ImDrawList: Fixed bug with PopClipRect() sometimes altering TextureId + fixed merging of draw calls with same TextureId 9 years ago
ocornut 3aebddc4ac Tweak GetGlyphRangesJapanese() to it is easier to modify 9 years ago
ocornut f505a372fd Speculative build fix for old versions of Visual Studio compiler 9 years ago
ocornut 6b23fca1ff Speculative build fix for using alloca on PS4 & FreeBSD 9 years ago
ocornut 0a23e2c832 Tabs to spaces 9 years ago
ocornut 5f0db60a57 Version number 1.47 WIP 9 years ago
ocornut 72dde4d323 Version 1.46 9 years ago
ocornut a5132286b7 ImDrawList: ChannelsSetCurrent() added an extra assert 9 years ago
ocornut edf730b672 Missing tidying up (#358) 9 years ago
osman-brian 69e6f299f3 Update imgui_draw.cpp
Fix Decode85 on big-endian systems.
9 years ago
ocornut c1983d5c3f Draw: Fixed rectangle rendering glitches with width/height <= 1/2 and rounding enabled. 9 years ago
omar 9d89e03346 Merge pull request #348 from zho7611/add_korean_support
ImFontAtlas: Added GetGlyphRangesKorean() for Korean.
9 years ago
Jiho Choi cc53d31764 Add support for Korean. 9 years ago
ocornut 0abe668221 ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice(#327) 9 years ago
ocornut bc8eb5e9cf ImDrawList, ImFontAtlas: comments, tweaks. moved less scary functions at the top of the file. 9 years ago
ocornut 7b1168eb30 Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size 9 years ago
ocornut 4d83519244 Comments (#328) 9 years ago
ocornut 8a3593257f Fixed warning with VS2015 in stb_truetype.h 9 years ago
ocornut e34ad0a05a ImDrawList: fixed 1 leak per ImDrawList using the ChannelsSplit() API (via Columns) (fix #318) 9 years ago
ocornut 965fa3cb16 Version number 1.46 WIP 9 years ago
ocornut c9e19f8953 Version number 1.45 9 years ago
ocornut f195bf744f Tabs to spaces 9 years ago
ocornut 4ab43dce19 Comments 9 years ago
ocornut 90e5c97f13 AddBezier()->AddBezierCurve(). PathBezierTo()->PathBezierCurveTo(), and reads current point back, more standard (#311) 9 years ago
ocornut 80ad773c87 ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves (#311) 9 years ago
ocornut a36001212f ImDrawData: added ScaleClipRects() helper (#287) 9 years ago