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