407 Commits

Author	SHA1	Message	Date
omar	87ded34f9f	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp	2019-02-22 12:29:18 +01:00
omar	677e64e71e	Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.	2019-02-20 21:34:08 +01:00
omar	257f5d204e	Version 1.69 WIP	2019-02-20 00:11:36 +01:00
omar	9dc02464a4	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-02-19 13:04:35 +01:00
omar	3c15dffc94	Version 1.68	2019-02-19 12:50:46 +01:00
omar	5bf9029bf9	Merge branch 'master' into docking	2019-02-18 12:16:13 +01:00
omar	f5bf6e38d2	Font: Fixed assert when specifying duplicate/overlapping ranges within a same font. (#2353, #2233)	2019-02-18 12:11:46 +01:00
omar	09c9bf2edb	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h	2019-02-14 20:35:11 +01:00
omar	93d1179805	Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency. ... Added more link to nothing's oversample document. Spacing bits.	2019-02-14 19:29:09 +01:00
omar	2cada3c143	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_widgets.cpp	2019-02-11 18:59:49 +01:00
omar	a79785c0b9	ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale). ... This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306, #1676) Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale. Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.	2019-02-11 18:52:08 +01:00
omar	4b41d3b280	ImFont: Rearranged members toward an optimal CalcTextSize() loop. Removed comments from destructor. Made constructor more explicit.	2019-02-09 15:54:47 +01:00
omar	be107ba8f8	Merge branch 'master' into docking ... # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-02-05 13:52:32 +01:00
omar	d38f4dc143	Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. (#261, #351)	2019-02-05 13:23:44 +01:00
omar	8e44aacc8e	Fonts: Fixed crash if FontGlobalScale is zero. Correctly debug naming default font if not 13 px. Demo: Moved PopupRounding along with other rounding values. Metrics: Displaying indexes with idx to be correct / less misleading.	2019-02-04 23:34:20 +01:00
omar	13a5f5ba8b	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	4e8e177cac	Persistently fixing some PVS-Studio static analyzer false positive warnings.	2019-01-27 16:35:48 +01:00
omar	c3c2cd1e82	Fix various XCode and PVS-Studio static analyzer warnings (#2309)	2019-01-27 16:18:23 +01:00
omar	f94af2f5c5	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp	2019-01-20 22:13:35 +01:00
omar	8079344cee	Merge branch 'master' into viewport ... # Conflicts: # examples/example_sdl_vulkan/main.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_vulkan.h # imgui.cpp	2019-01-20 22:12:06 +01:00
omar	2c38b32db1	Removed trailing spaces (#2038, #2299)	2019-01-20 17:56:17 +01:00
omar	f94ba546ba	Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)	2019-01-20 17:46:00 +01:00
omar	82e31d34f0	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_win32.cpp	2019-01-18 12:31:33 +01:00
omar	bebb07f12d	ImFontAtlas: Added 0x2000-0x206F general punctuation range to default ChineseFull/ChineseSimplifiedCommon ranges. (#2093)	2019-01-17 16:48:11 +01:00
omar	b5144e477f	Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt	2019-01-17 14:06:42 +01:00
omar	e9c625a1dc	Merge branch 'master' into viewport ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp	2019-01-17 14:05:40 +01:00
omar	8cbb91261e	ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery] ... + Demo tweaks	2019-01-16 17:47:49 +01:00
omar	32c4e01267	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:13:23 +01:00
omar	06aaf23877	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)	2019-01-16 16:10:51 +01:00
omar	8a45c56c2c	Merge branch 'viewport' into docking	2019-01-15 21:22:29 +01:00
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	ff4bd758ca	Merge branch 'viewport' into docking	2019-01-14 21:30:07 +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	529fccd9c2	Merge branch 'viewport' into docking	2019-01-13 14:19:40 +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	8011197c50	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp	2019-01-10 16:02:32 +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	6b32570644	Merge branch 'viewport' into docking ... # Conflicts: # imgui_internal.h # imgui_widgets.cpp	2019-01-07 21:29:15 +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	e043b89814	Merge branch 'viewport' into docking ... # Conflicts: # imgui.h	2018-12-20 17:03:21 +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