355 Commits

Author	SHA1	Message	Date
omar	9391a97fbf	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h	2019-01-15 21:22:21 +01:00
omar	95ee99e6aa	Version 1.68 WIP	2019-01-15 20:19:05 +01:00
omar	e24674fc0e	Merge branch 'master' into viewport	2019-01-14 21:30:01 +01:00
omar	7a5058e3bf	Version 1.67	2019-01-14 17:41:44 +01:00
omar	6e41745f31	Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)	2019-01-13 18:57:46 +01:00
omar	4ee4f65c70	Merge branch 'master' into viewport	2019-01-13 14:19:31 +01:00
omar	651130002f	ImFontAtlas: Fixed allocating for last bit (would only affect is that last codepoint is a multiple of 32). (#2270)	2019-01-11 15:25:43 +01:00
omar	9a9712807e	ImFontAtlas: Rewrote stb_truetype based builder. ... - Atlas width is now properly based on total surface rather than glyph count (unless overridden with TexDesiredWidth). - Fixed atlas builder so missing glyphs won't influence the atlas texture width. (#2233) - Fixed atlas builder so duplicate glyphs (when merging fonts) won't be included in the rasterized atlas.	2019-01-10 22:23:05 +01:00
omar	c96aaef132	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2019-01-10 16:01:36 +01:00
omar	9ad341902d	ImDrawList: Optimized some of the functions for performance of debug builds where non-inline function call cost are non-negligible.	2019-01-08 17:37:22 +01:00
omar	5af930f97a	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2019-01-07 21:28:29 +01:00
omar	acfa4050ec	Tweak changelog + tweak internal render helper functions.	2019-01-07 16:43:55 +01:00
omar	5cb7ce2085	Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).	2019-01-06 16:59:51 +01:00
omar	02501f07c3	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-12-20 16:54:32 +01:00
omar	8399fb5071	Changed ImGuiCol_ChildBg to (0,0,0,0) in Dark style instead of (1,1,1,0), to match other styles. Shouldn't have any effect for the end-user.	2018-12-19 15:20:18 +01:00
omar	c40feabe4d	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-12-11 12:41:40 +01:00
omar	54a60aaa40	Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature) ... - Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API. - Added ImGuiTabBarFlags flags for BeginTabBar(). - Added ImGuiTabItemFlags flags for BeginTabItem(). - Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors. - Demo: Added Layout->Tabs demo code. - Demo: Added "Documents" example app showcasing possible use for tabs.	2018-12-11 12:36:47 +01:00
omar	3a678d48b1	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp	2018-12-04 00:05:45 +01:00
omar	10e13dd6bb	Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).	2018-12-03 12:19:23 +01:00
omar	65e579e558	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.cpp # examples/imgui_impl_win32.cpp # imgui.h # imgui_demo.cpp	2018-12-03 11:41:53 +01:00
omar	801645d350	Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).	2018-12-03 10:17:17 +01:00
omar	8289e5f6b4	Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.	2018-11-30 23:48:25 +01:00
omar	84238240d6	Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.	2018-11-30 23:47:23 +01:00
Sebastian Krzyszkowiak	3335e6688f	Include <alloca.h> also on macOS (and osxcross) (#2218)	2018-11-30 16:57:09 +01:00
omar	5261e5a6ba	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-11-26 14:53:51 +01:00
omar	d27ffefbd4	Version 1.67 WIP	2018-11-22 18:59:57 +01:00
omar	d87b80c6c1	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-11-22 15:28:27 +01:00
omar	da3c4330c1	Version 1.66	2018-11-22 15:11:52 +01:00
omar	056af2b1af	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui.h	2018-10-18 10:56:26 +02:00
Elias Daler	8606d9fa11	Fix Clang/GCC's null-conversion warning: (#2081) ... The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example.	2018-10-15 17:07:06 +02:00
omar	e73217d6f7	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	2018-10-12 15:50:48 +02:00
omar	ede3a3b92d	Fixes crash introduced in previous commit 9cf94d5.	2018-10-12 13:29:13 +02:00
omar	9cf94d5dd6	RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.	2018-10-12 12:34:47 +02:00
omar	6cc380fc41	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp	2018-09-26 21:34:52 +02:00
omar	5719b23e01	ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty.	2018-09-21 10:00:26 +02:00
omar	b85f345369	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_vulkan.cpp	2018-09-14 11:32:55 +02:00
ice1000	201fcfd2e5	Internals: Replace unsigned short with ImWchar when dealing with character storage. (#2078)	2018-09-11 22:00:57 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	eb7033e75b	Version 1.66 WIP	2018-09-06 21:44:59 +02:00
omar	b974fffea0	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-09-06 15:59:35 +02:00
omar	e0cab5664a	Version 1.65	2018-09-06 15:58:58 +02:00
omar	5a679a45cc	Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718, #2036) ... If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths. The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.	2018-09-06 15:58:25 +02:00
omar	a2616c79fe	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-09-06 11:42:11 +02:00
omar	e58bc3d5b7	Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036)	2018-09-06 11:36:00 +02:00
omar	a848807847	Minor inconsequential merges from Master/Docking branches	2018-09-05 11:51:45 +02:00
omar	bdb30d7145	Merge branch 'master' into viewport	2018-09-05 11:08:57 +02:00
omar	bcb1441ce7	Version 1.65 WIP	2018-09-03 14:38:04 +02:00
omar	0c24fe276c	Merge branch 'master_164' into viewport_164 ... # Conflicts: # imgui.cpp # imgui_draw.cpp # imgui_widgets.cpp	2018-08-31 10:28:21 +02:00
omar	48db5713d6	Version 1.64	2018-08-31 10:00:03 +02:00
omar	38cfcf9fbc	Tweak comments and indexes	2018-08-31 09:59:58 +02:00