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 |
|