919 Commits

Author	SHA1	Message	Date
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	0236bc246f	Scrollbar: Fade out and disable interaction when too small, in order to facilitate using the resize grab on very small window, as well as reducing visual noise/overlap. (+1 squashed commits) ... Internals: Added GetScrollbarID(). (#1185)	2019-02-14 14:07:59 +01:00
omar	4a3a895be9	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_demo.cpp	2019-02-06 14:47:53 +01:00
omar	f366828dd2	Minor tweaks to reduce false positive of PVS Studio static analyzer.	2019-02-06 13:16:52 +01:00
omar	97ed97b8ce	Plot: Register an ID to take the click the same way as other framed widgets. Set HoveredId in the FramePadding zone (between inner_bb and frame_bb).	2019-02-05 21:17:04 +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	7227454dca	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h	2019-02-03 17:31:16 +01:00
omar	c23a19c26f	Internals: Exposed internal SetWindowPos to imgui_internal.h (for imgui-test)	2019-02-03 17:29:51 +01:00
omar	d1c45c0d76	Merge branch 'master' into docking (enable range_select merge) ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-02-01 12:25:49 +01:00
omar	5cb7040f66	Internals: Tracking dummy select scope id (currently always zero) to facilitate merging of the range_select branch. (#1861)	2019-02-01 12:14:38 +01:00
omar	0d4a2a2cd0	Internals: Track ActiveIdHasBeenPressed (similar to ActiveIdHasBeenEdited). This is currently mostly for the benefit of the range_select branch. (#1861)	2019-02-01 12:14:37 +01:00
omar	e30babef09	Fixed Clang/Win32 warning.	2019-02-01 11:22:53 +01:00
omar	cbf24a9151	Comments. Fix duplicate entries in About box. Synchronize a few small changes from Master branch.	2019-02-01 11:04:04 +01:00
omar	52a9f8bd3e	Merged from Docking branch: Various small changes, comments, typos fixes, moved blocks. To reduce overall drift. Should be no-op.	2019-02-01 10:26:08 +01:00
omar	f906d53f7d	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-01-31 19:19:35 +01:00
omar	1f2bdd37b3	Docking: Builder: Added DockBuilderSetNodePos, DockBuilderSetNodeSize, allow DockBuilderAddNode creating floating node (dockspace requires ImGuiDockNodeFlags_Dockspace) (#2109)	2019-01-31 17:01:15 +01:00
omar	5536edede9	Docking: Fixed faulty undocking of windows with the _NoMove flag. (#2325, #2109) ... Whereas BeginAsDockableDragDropTarget could be reworked to filter, we simply set g.HoveredWindowUnderMovingWindow to be NULL when MovingWindow is not set, which was the initial intent. Also fixed some comments and removed unused braces in TabItemEx().	2019-01-31 14:59:45 +01:00
omar	578e15f006	Docking: Removed unnecessary ImGuiTabItemFlags_DockedWindow internal flag.	2019-01-31 14:55:00 +01:00
omar	fb4f1ff7f6	InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. (#2321, #787)	2019-01-30 15:16:09 +01:00
omar	0a233a505d	imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.	2019-01-30 12:53:01 +01:00
omar	86d3bba157	Added ImGuiDockNodeFlags_AutoHideTabBar. (#2109)	2019-01-29 18:28:31 +01:00
omar	13a5f5ba8b	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp	2019-01-27 16:46:35 +01:00
omar	c3c2cd1e82	Fix various XCode and PVS-Studio static analyzer warnings (#2309)	2019-01-27 16:18:23 +01:00
omar	07ff47bf1b	Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. (#2109)	2019-01-23 19:54:45 +01:00
omar	9f96fcff3c	Docking: Added ImGuiDockNodeFlags_Dockspace instead of node internal IsDockspace toward allowing the DockBuilder API to create non-dockspace nodes.	2019-01-23 19:24:34 +01:00
omar	c81a5a6070	Docking: Comments and renaming locals to facilitate debugging.	2019-01-22 12:38:10 +01:00
omar	0947fa3de0	Merge branch 'viewport' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h	2019-01-21 16:54:37 +01:00
omar	cb9a6b8a8b	Merge branch 'master' into viewport ... # Conflicts: # examples/README.txt # imgui.cpp	2019-01-21 16:52:22 +01:00
omar	f14f93ef6e	Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.	2019-01-21 16:50:27 +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	d1851ed6b7	Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]	2019-01-16 16:19:38 +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	515ad62335	Merge branch 'viewport' into docking ... # Conflicts: # docs/TODO.txt	2019-01-15 15:14:16 +01:00
omar	73353fad64	Merge branch 'master' into viewport	2019-01-15 15:13:29 +01:00
omar	d38d7c6628	TODO update + internals: changed order or ImGuiLayoutType enums to allow using them for indexing.	2019-01-15 15:06:24 +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	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	e3ccc96789	Internals: Added ImBoolVector helper.	2019-01-10 16:10:02 +01:00