mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,208 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

487 Commits

Author SHA1 Message Date
Rokas Kupstys 7e59eb026b Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950) 2018-07-17 17:17:56 +02:00
omar 5e73e969fb Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper. 2018-07-12 11:08:24 +02:00
omar 23288547ec Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939) 2018-07-12 09:53:10 +02:00
omar c7016c25e8 Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787) 2018-07-09 19:16:48 +02:00
omar 93950b8c32 Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code. 2018-07-06 15:50:07 +02:00
omar 645ab6633c Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276) 2018-07-01 12:25:37 +02:00
omar 6e67afc500 Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914) 2018-06-29 16:36:40 +02:00
omar 62b3d7c51e Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914) 2018-06-29 16:36:40 +02:00
Aiekick ecd9a223e3 add hand cursor support (+11 squashed commit) 2018-06-29 16:36:40 +02:00
omar c1d8dee6c5 Version 1.63 WIP 2018-06-25 09:40:09 +02:00
omar fb0106fad2 Demo: Fixed incorrect response to Begin() returning false in overlay demo (which cannot happen since we don't have a title bar, but that doesn't make it a good behaving demo!). 2018-06-25 09:32:55 +02:00
omar 1b74e3be02 Version 1.62 2018-06-22 09:41:25 +02:00
omar f5bf9f509c ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. (#1869) 2018-06-08 12:52:46 +02:00
omar d44faa165a Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. (#1859) 
Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.
 2018-06-06 12:35:36 +02:00
omar 6c684ae39b Fixed GCC pre-8 build. (#1822) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo 2018-05-17 18:10:20 +02:00
omar 64b1645deb Disabled GCC 8.1.0 warnings -Wclass-memaccess (#1822) 2018-05-17 14:19:20 +02:00
omar d5c8f404b2 Remove trailing white spaces. 2018-05-17 14:12:37 +02:00
omar 036dce634e Version 1.62 WIP 2018-05-14 19:19:19 +02:00
omar 78b28d545f Version 1.61 + todo additions 2018-05-14 12:34:47 +02:00
omar 2a2bb8970d Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments. 2018-05-13 22:31:29 +02:00
omar ff033f431b Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments. 2018-05-13 21:04:07 +02:00
omar 8149408408 Merge branch 'data_types' 
# Conflicts:
#	CHANGELOG.txt
#	imgui.cpp
 2018-05-11 16:48:50 +02:00
omar 280c05e4f8 Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit. 2018-05-08 11:02:38 +02:00
omar 0bf43b3a1b Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993) 2018-05-07 22:18:45 +02:00
omar 6eda9ed3fb Skip missing font glyphs V2 revert changes to stb_truetype.h ( 2018-05-07 19:57:53 +02:00
omar a62f195e83 Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations. 2018-05-03 17:33:55 +02:00
omar 28edece04f Comments, minor tweaks 2018-04-27 17:32:03 +02:00
omar 928a4ad315 Begin: moved tooltip position code in an else block. Misc comments 2018-04-10 16:51:16 +02:00
omar 6f1f5cbc20 Version 1.61 WIP 2018-04-09 14:02:32 +02:00
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 2018-04-09 13:13:06 +02:00
omar 3a29ddbcfa Version 1.60 2018-04-08 00:45:02 +02:00
omar 82b7a39f31 Fixed a few zealous warnings. 2018-04-07 10:38:01 +02:00
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. 2018-04-03 23:18:43 +02:00
omar 78610a54d2 Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now. 2018-04-03 20:55:30 +02:00
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.
 2018-03-20 18:25:37 +01:00
omar 1e296453ef ImDrawList: Added Clone() helper function. 2018-03-17 21:18:14 +01:00
omar 533c86a7a3 Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows. 2018-03-17 17:29:58 +01:00
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) 2018-03-12 11:48:04 +01:00
omar 1f6ad7a894 ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d 2018-03-10 10:33:12 +01:00
omar a3d5f92214 Merge branch 'master' into font_offset 2018-03-08 16:49:39 +01:00
omar 1ef1acbd8d Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5) 2018-03-08 16:47:41 +01:00
omar 3dfac93ebe Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well. 2018-03-08 15:58:56 +01:00
omar 945f4d1ecd Removed redundant semi colons. (#1653) 2018-03-05 16:16:27 +01:00
omar 0ec356eb6e Comments, FAQ update. 2018-03-05 13:05:47 +01:00
omar 69e700f869 Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added 2018-03-03 20:15:10 +01:00
omar 403b2d7d59 ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). (#1646) 2018-02-25 14:15:37 +01:00
omar 79969931e6 ImDrawList: PushTextureID(): Removed unnecessary param by reference. 2018-02-23 00:01:34 +01:00
omar 7c75835200 Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626) 2018-02-16 19:49:33 +01:00
omar c433bbcd8e ImFont: stb_truetype now rounding Ascent/Descent the same way as freetype does, they seem to vertically align better this way. 2018-02-15 10:47:20 +01:00
omar 30c469f7c5 ImFont: DisplayOffset.y defaults to 0 instead of +1. 2018-02-15 10:46:28 +01:00
omar 024e23c4d7 Comments, moved ImFontAtlas::Flags to "public" area. 2018-02-14 12:04:21 +01:00
omar fed0a884f7 ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. (#1613) 2018-02-14 11:58:52 +01:00
omar 6bc3e7b043 ImFontAtlas: if stbtt_PackBegin() because of failing allocation we return a little more nicely. (keeps Coverity static analyzer happy!) 2018-02-13 21:57:15 +01:00
omar 88dcbeb7ff Styles: Comments and re-ordered. 2018-02-08 21:14:57 +01:00
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) 2018-02-06 20:20:34 +01:00
omar 47e81a6194 Merge branch 'master' into navigation 2018-01-31 16:00:25 +01:00
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 2018-01-31 16:00:07 +01:00
omar ed088b00be Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707) 2018-01-25 18:50:30 +01:00
omar 9edf211c0e Merge branch 'master' into navigation 2018-01-21 20:46:50 +01:00
omar 5eb293c879 ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight) 2018-01-20 20:32:23 +01:00
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) 2018-01-20 20:25:12 +01:00
omar 66b2ee6ea2 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2018-01-07 14:25:05 +01:00
omar ecbfdd3143 Added extraneous initialization to NULL. (#1527). 2018-01-04 11:06:12 +01:00
omar 96ccc484f9 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 2018-01-03 12:33:27 +01:00
Branimir Karadžić 856ee17ed8 Fixed Android clang warning. 2018-01-03 10:29:37 +01:00
omar 7e03ee8d85 Merge branch 'master' into navigation 2018-01-02 17:21:49 +01:00
omar 4af84ac781 ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527) 2017-12-30 23:10:11 +01:00
omar c4e6d622c1 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-12-29 13:39:07 +01:00
omar 49eed6e2d1 Version 1.54 WIP 2017-12-28 15:17:35 +01:00
omar 436cad4bca Merge branch 'master' into navigation 
# Conflicts:
#	imgui.h
 2017-12-26 15:37:31 +01:00
omar e916310b2e Version 1.53 2017-12-25 17:41:41 +01:00
omar de5c304b49 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-12-24 18:59:40 +01:00
omar cead207535 Comments 2017-12-24 17:58:41 +01:00
omar ffb4f6ca8c Merge branch 'master' into navigation 2017-12-23 16:27:48 +01:00
omar d976e4ea23 Internals: Missing IM_DELETE usage (#1517) 2017-12-23 16:27:16 +01:00
omar 9cda86d55a Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504) 2017-12-23 16:24:33 +01:00
omar 983d8f5f8e Various zealous warning fixes (Clang). 2017-12-23 15:28:49 +01:00
omar 1f26652944 Various zealous warning fixes (thanks Clang). 2017-12-23 14:07:03 +01:00
omar 287380261c Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-12-21 19:55:21 +01:00
omar 996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore. 2017-12-21 19:49:54 +01:00
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. 2017-12-21 19:01:53 +01:00
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. 2017-12-21 18:52:34 +01:00
omar fa9327ccf8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
 2017-12-12 20:44:12 +01:00
omar e98df91dc4 Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707) 2017-12-12 15:44:22 +01:00
omar 38bfdb357e Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-12-11 16:28:47 +01:00
omar 6d93011fdf alloca fix to allow Clang with Microsoft CodeGen path 2017-12-11 10:25:44 +01:00
omar 364251146b Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-12-05 16:15:05 +01:00
omar aea3fe41b9 Style: Tweaks Dark and Light styles. (#707) 2017-11-30 23:15:55 +01:00
omar f5c47faee8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 2017-11-24 16:55:31 +01:00
Giuseppe Barbieri 1b2ec35b8d
Update imgui_draw.cpp 2017-11-22 12:58:11 +01:00
omar 2543807e56 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2017-11-20 13:54:06 +01:00
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). 2017-11-20 13:53:16 +01:00
omar 31683cfe34 ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. (#845) 2017-11-20 13:31:40 +01:00
thedmd 79f07f6ff0 Add AddImageRounded() to ImDrawList 2017-11-19 21:56:46 +01:00
thedmd 8b2d449b16 Add ShadeVertsLinearUV() 2017-11-19 21:56:36 +01:00
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
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) 2017-08-26 14:11:56 +08:00
omar 304de0ee1b ImFontConfig: Comments, const. 2017-08-26 14:11:41 +08:00
omar 40f608ce9b Version 1.52 WIP 2017-08-25 15:12:12 +08:00
omar 55a6209931 Version 1.51 2017-08-25 00:29:59 +08:00
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2017-08-20 18:22:34 +08:00
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended) 2017-08-20 15:38:05 +08:00
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 2017-08-17 21:19:54 +08:00
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 2017-08-17 21:13:14 +08:00
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618) 2017-08-17 20:44:44 +08:00
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) 2017-08-17 19:36:48 +08:00
omar 24a78767d2 Merge branch 'master' into styles 
# Conflicts:
#	TODO.txt
 2017-08-17 17:24:33 +08:00
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification 2017-08-17 15:35:59 +08:00
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) 2017-08-17 11:46:25 +08:00
James Wallis 9239e91dc9 Whitespace fix to previous 2017-08-15 14:12:32 +01:00
James Wallis 718f00d651 Make font atlas packing padding configurable 2017-08-15 14:11:04 +01:00
omar 18b50f8eba Comments 2017-08-15 11:41:36 +08:00
omar f8f382221c ImVector: added resize() variant with initialization value 2017-08-15 11:41:00 +08:00
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization 2017-08-14 21:00:44 +08:00
omar d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() 2017-08-14 16:53:38 +08:00
omar d2c219df84 Merge pull request #826 from swetland/patch 
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
 2017-08-14 16:50:20 +08:00
omar 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments. 2017-08-14 12:25:35 +08:00
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc 2017-08-09 22:42:03 +08:00
omar e63ebd997f Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0) 2017-07-31 12:25:27 +08:00
omar df56879883 imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point. 2017-07-26 14:53:15 +08:00
omar 1987e23ce5 ImDrawList::PrimReserve() minor renaming of locals to make things clearer 2017-07-15 17:52:52 +08:00
omar afae9398cb Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place. 2017-07-14 17:49:42 +08:00
omar 12d265fa31 Version 1.51 WIP tag 2017-06-13 11:30:22 +02:00
omar a2f7c40e30 Fixed comment (#1178) 2017-06-13 11:29:21 +02:00
omar 5e1caaaef3 Version 1.50 2017-06-02 12:22:34 +02:00
omar 9da53bcecd ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change) 2017-05-26 13:42:36 +02:00
omar c5c77a3476 ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon. 2017-05-26 13:36:52 +02:00
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account 2017-05-14 16:27:10 +02:00
omar a0a6c8a2ef Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API) 2017-05-01 12:36:46 +02:00
omar 6517d68cdf ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK (#1009) 2017-05-01 12:34:32 +02:00
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.
 2017-04-28 10:04:20 +02:00
omar 670775ac22 Added assert/comment about using MergeMode (#1100) 2017-04-13 20:01:24 +02:00
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 2017-03-17 21:29:57 +01:00
omar b84eac53d8 ImFont: Reorder field initialization to match declaration order 2017-03-17 21:29:28 +01:00
omar b8043d3ee5 Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917) 2017-01-14 13:47:16 +01:00
ocornut 68df09cf47 Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse) 2017-01-01 20:11:40 +01:00
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. 2016-11-13 23:58:09 -08:00
ocornut 8553bab241 Ignoring overzealous GCC warnings (#883) 2016-11-11 20:17:35 +01:00
ocornut 620497e466 Font: Font name include size 2016-11-06 22:21:21 +01:00
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" 2016-11-06 21:51:20 +01:00
ocornut 907dd2ed20 Comments (#896) 2016-11-06 15:25:28 +01:00
ocornut d567595dde ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions 2016-10-09 10:35:01 +02:00
ocornut e07d45709f ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing (#844) 2016-10-07 09:49:52 +02:00
Jeongseok Lee 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro' 2016-10-06 14:48:47 -04:00
ocornut 68c81739bf Minor tidying up following merge BGRA color PR (#844) 2016-10-01 14:29:12 +02:00
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format. 2016-09-26 12:00:33 +02:00
ocornut 35c6fd682f Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder (#839) 2016-09-23 09:09:07 +02:00
ocornut 87d99fce6b ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df) 2016-09-19 09:32:21 +02:00
Brian Swetland 5a47346f5a ImFont: add RenderGlyph() to allow rendering of individual glyphs 2016-09-10 18:21:49 -07:00
ocornut 8efd05a148 Tab->Spaces, missing spaces, typos 2016-07-20 11:39:38 +02:00
Adisorn Aeksatean 4141144b21 Added GetGlyphRangesThai() 2016-07-20 11:37:08 +02:00
ocornut 4961b2ea18 Speculative build fix for FreeBSD+GLIBC configuration 
See
a1f9b62dd0
 2016-07-16 11:44:10 +02:00
ocornut d79186931e ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command 2016-06-11 15:42:10 +02:00
ocornut 65a525550e ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000) 2016-06-07 09:14:54 +02:00
ocornut 5d4cf1c3f3 Version 1.50 WIP 2016-05-30 19:38:36 +02:00
ocornut adb85d800d Version 1.49 2016-05-29 19:16:44 +02:00
ocornut b4302187dd ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field. 2016-05-17 19:47:13 +02:00
Branimir Karadžić a59a04f4d0 Fixed iOS/OSX build. 2016-05-10 01:10:31 +02:00
omar 8af76d56b4 Merge pull request #639 from sergof/conversion-warnings 
Ignore various anal GCC warnings.
 2016-05-07 21:08:43 +02:00
ocornut 8b428e8c74 Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269) 2016-05-07 19:54:27 +02:00
Sergej Reich 6e8579fc14 Ignore implicit conversion warnings 2016-05-07 18:49:24 +02:00
ocornut f22b6e1e09 Fixed/silenced various absurd GCC warnings from outer space (#626) 2016-05-04 23:28:16 +02:00
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings (#626) 2016-05-04 23:17:53 +02:00
ocornut 7406d64c64 PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582) 2016-04-30 18:55:23 +02:00
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610) 2016-04-26 11:03:51 +02:00
ocornut 4b6e9ac396 ImFont: Added AddRemapChar() helper (#609) 2016-04-26 10:08:06 +02:00
ocornut 727ca4bd17 ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes 2016-04-23 11:37:18 +02:00
ocornut a20d69f9ce ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split 2016-04-23 11:29:42 +02:00
ocornut 44fb99542f ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead. 2016-04-23 11:09:56 +02:00
ocornut fe73a23cf5 ImFont: Added RenderChar() helper. 2016-04-22 19:58:10 +02:00
ocornut d92f1deff8 ImDrawList: Added AddQuad(), AddQuadFilled() helpers. 2016-04-18 19:04:47 +02:00
Sergej Reich d5eb87d0a2 Fix font config propagation in FontFromMemoryCompressedTTF() 2016-04-13 02:01:18 +02:00
ocornut 1588eda1ac Version 1.49 WIP 2016-04-09 19:10:42 +02:00
ocornut 95cbcdca3f Version 1.48 2016-04-09 17:46:48 +02:00
omar 39c9bb73e8 Merge pull request #563 from mneumann/fix_dragonfly 
Fix compilation on DragonFly BSD
 2016-03-26 16:40:00 +01:00
ocornut 2b7eeba143 Trim trailing spaces 2016-03-26 15:38:52 +01:00
Michael Neumann adb4d4d48b Fix compilation on DragonFly BSD 2016-03-24 19:37:11 +01:00
ocornut 5bed7144fe ImDrawList: Added AddTriangle() function 2016-03-22 20:10:06 +01:00
ocornut 9260d46c2c Comments 2016-03-21 22:51:51 +01:00
ocornut b495a52fc0 ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default 2016-03-21 22:43:53 +01:00
ocornut 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes 2016-03-21 22:11:43 +01:00
ocornut 9cbc6e196b ImDrawList: AddRect() added optional thickness parameter + updated demo 2016-03-21 21:56:23 +01:00
ocornut 86fb3a6a3c ImDrawList: AddCircle() takes optional thickness parameter 2016-03-21 21:48:05 +01:00
ocornut 2efaa9a86f ImDrawList: fixed index overflow check broken by AddText(). Added extra assert. (#514) 2016-01-30 17:01:10 +01:00
ocornut 595684e08c Remove dependency on <new> header (#484, #504) 
(Now expecting something to fail somewhere..)
 2016-01-25 21:26:53 +00:00
ocornut b6fe5eb4b4 Cleaned up the top of imgui.h, documenting all types / forward declarations 2016-01-23 12:45:56 +00:00
ocornut a81a5e5235 Commented Clang warning that's not compatible with all versions. Comments. 2016-01-21 21:40:22 +00:00
ocornut e585204d82 ImFontAtlas: heuristic increase texture width up to 4096 with 4000+ glyphs. Various comments (#491) 2016-01-20 10:30:28 +00:00
ocornut 76ca7c42ca ImDrawList: Added PrimQuadUV() helper to ease custom rendering of textured quads 2016-01-08 14:57:25 +00:00
ocornut d212401624 Fixed ImDrawList::AddRect() which used to render a rectangle 1 px too large on each axis., fixed Image(), ImageButton() as well (#457) 2015-12-27 21:31:43 +01:00
ocornut 6dbdc69131 ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457 2015-12-27 20:18:43 +01:00
ocornut dc4a07c49a Fixed various Clang -Weverything warnings 2015-12-26 14:59:07 +01:00
ocornut e41568f87f Version number 1.48 WIP + Update binaries 2015-12-26 10:02:57 +01:00
ocornut 24d186753e Version number 1.47 2015-12-25 22:44:03 +01:00
ocornut 2849596069 Comments about ImDrawList::PushClipRect 2015-12-25 11:59:49 +01:00
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" (#21) 2015-12-24 20:00:50 +01:00
ocornut 0b10bec71f ImDrawList: Simplified code and added check to avoid mis-recycling a callback command. 2015-12-16 01:13:36 +00:00
ocornut 0873da85ec ImDrawList: Fixed bug with PopClipRect() sometimes altering TextureId + fixed merging of draw calls with same TextureId 2015-12-16 01:01:34 +00:00
ocornut 3aebddc4ac Tweak GetGlyphRangesJapanese() to it is easier to modify 2015-11-29 11:55:54 +00:00
ocornut f505a372fd Speculative build fix for old versions of Visual Studio compiler 2015-11-28 20:00:40 +00:00
ocornut 6b23fca1ff Speculative build fix for using alloca on PS4 & FreeBSD 2015-10-30 18:05:06 +01:00