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 |