6051 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
omar	9cc63ba279	Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078)	2018-09-11 22:00:57 +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	1cefc48f13	Docking: Internal renaming and comments. + Fixed DockNodeMoveChildNodes() to transfer the LastExplicitSize value (was inconsequential afaik).	2018-09-11 18:53:08 +02:00
omar	211a9c8fd2	Docking: Added ImGuiDockSpaceFlags_KeepAliveOnly, important for multiple level of tabs. (also renamed ImGuiDockFlags to ImGuiDockSpaceFlags.)	2018-09-11 17:58:09 +02:00
omar	f29b3b4033	Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)	2018-09-11 15:35:53 +02:00
omar	df65d4a14f	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp # imgui_internal.h	2018-09-11 11:18:46 +02:00
omar	d014d0285a	DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. (#2024)	2018-09-11 11:15:06 +02:00
omar	af6cf25255	DragFloat: Fixed a situation where dragging with value rounding enabled or with a power curve erroneously wrapped the value to one of the min/max edge. (#2024, #708, #320, #2075).	2018-09-11 10:55:52 +02:00
omar	c4e26f4b92	Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. (#1542, #787)	2018-09-10 22:19:54 +02:00
omar	416918429d	Docking: Added Type enum in ImGuiDockRequest. Renamed fields. DockSpace() skips node update if already submitted (when transitioning from implicit -> explicit DockSpace).	2018-09-10 22:09:43 +02:00
omar	e2436ca625	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:40:21 +02:00
omar	d5692bff00	Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.	2018-09-10 20:30:14 +02:00
omar	dcef0c0237	Docking: Updating LastFrameActive earlier in Begin() because BeginDocked() will need to use it. Extracted some code into a DockNodeIsDropAllowedOne() function. Comments.	2018-09-10 20:23:03 +02:00
omar	a68c98bb67	Docking: Added SetNextWindowUserType() + user type filtering in dockspace and window merging. Added DockSpace() flag ImGuiDockFlags_NoSplit. Renaming. Reworked the DockNodeUpdateFindOnlyNodeWithWindows code so DockNodeUpdate can access the first window.	2018-09-10 14:32:00 +02:00
omar	b872aa5c8e	Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().	2018-09-10 11:24:27 +02:00
MindSpunk	7eadcf7d7d	example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036)	2018-09-09 21:09:58 +02:00
omar	062b1f0463	Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. (#2067)	2018-09-07 22:30:46 +02:00
omar	2eaf722fd7	Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. (#2066)	2018-09-07 17:24:56 +02:00
omar	a82be53407	Merge branch 'docking2' into viewport_docking ... # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2018-09-06 22:28:21 +02:00
omar	49533bc86e	Examples: Enabled Docking + Nav by default in the branch. (#351)	2018-09-06 21:53:35 +02:00
omar	e381f22ac1	Docking: Added Docking system. (Part 3) (#351)	2018-09-06 21:45:46 +02:00
omar	9ac1e93aa1	Docking: Added Docking system. (Part 2) (#351)	2018-09-06 21:45:46 +02:00
omar	bd5b38e232	Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) (#351)	2018-09-06 21:45:46 +02:00
omar	5adcb9ce6d	Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).	2018-09-06 21:45:45 +02:00
omar	2ec135c9f7	Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.	2018-09-06 21:45:45 +02:00
omar	58d46e1fe6	Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261, #351)	2018-09-06 21:45:44 +02:00
omar	c039a77d21	Internals: Added ImPool helper structure. Moved ImVec1f.	2018-09-06 21:45:10 +02:00
omar	741bdf151a	Added ImGuiWindowFlags_UnsavedDocument flags.	2018-09-06 21:45:10 +02:00
omar	5070c769b8	Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)	2018-09-06 21:45:09 +02:00
omar	52e0de84a9	Internals: Split RenderTextClipped into two functions.	2018-09-06 21:45:09 +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	0b18c11440	Refactor: Moved ImFile functions. (#2036)	2018-09-06 11:36:00 +02:00
omar	ab64e8f993	Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. (#2036)	2018-09-06 11:36:00 +02:00
omar	31b5b18611	Merge branch 'master' into viewport ... # Conflicts: # imgui.cpp	2018-09-05 20:59:27 +02:00
omar	bb3184af74	Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) (#2036)	2018-09-05 20:54:28 +02:00
omar	cbdce80837	Internals: Refactor: Moved render functions to their own section. (#2036)	2018-09-05 20:46:57 +02:00
omar	8601c39571	Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)	2018-09-05 17:50:55 +02:00
omar	af27ec296b	Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags ... # Conflicts: # imgui.cpp # imgui.h	2018-09-05 17:38:47 +02:00
omar	65876f348a	Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787)	2018-09-05 17:33:00 +02:00
omar	77ba883f23	Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.	2018-09-05 17:29:47 +02:00
omar	bbcc976739	Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.	2018-09-05 17:29:47 +02:00
omar	b944aa623c	Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'	2018-09-05 11:52:48 +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	897e5c6231	Viewport: Moved code following refactor. (#2036, #1542)	2018-09-05 11:08:44 +02:00