229 Commits

Author	SHA1	Message	Date
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