omar
|
2a5ce1849a
|
Docking, Viewport: Reworked viewport inheritance/transition so that extracting a dock node from a split node owning its viewport will have both viewports be in the expected OS z-order. (The lower window re-use the exiting viewport, the detached node uses a new viewport:
|
2018-09-24 10:53:51 +02:00 |
|
omar
|
ae4b838840
|
Docking, Viewport: Rework ownership transfer/stealing to fix issues where non-child windows could be stick marked as not owning their viewport.
|
2018-09-24 10:48:56 +02:00 |
|
omar
|
79c075ca09
|
Docking+Viewport: Fixed PlatformRequestClose (e.g. ALT-F4) being redrected to the first window of the docking node instead of the selected one.
|
2018-09-24 10:48:55 +02:00 |
|
omar
|
67be485e24
|
Docking: Fixed losing tab bar selection when extracting a whole docked node + reusing existing dock node when possible.
|
2018-09-21 16:23:00 +02:00 |
|
omar
|
fda57f48d5
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl2/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
# examples/example_win32_directx9/main.cpp
|
2018-09-21 11:52:32 +02:00 |
|
omar
|
840652830d
|
Docking: Fixed undocking on whole dock node from leaving undesirable empty node in the docking tree. Fixed calls to MarkIniSettingsDirty().
|
2018-09-21 11:50:49 +02:00 |
|
omar
|
5eabf44021
|
Nav: Use Platform_SetWindowFocus when CTRL+Tabbing to another viewport.
|
2018-09-21 11:49:43 +02:00 |
|
omar
|
599d5f185c
|
TabBar: Recover if SelectedTabId doesn't exist anymore.
|
2018-09-21 11:02:03 +02:00 |
|
omar
|
3e47978a80
|
Docking: Renamed ImGuiDockSpaceFlags to ImGuiDockNodeFlags. Clarified in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.
|
2018-09-20 09:52:51 +02:00 |
|
omar
|
e647f89c33
|
Docking: Added undocking of whole dock node by dragging from the Collapse button. Super useful and works great!
|
2018-09-19 22:38:40 +02:00 |
|
omar
|
82978fc88f
|
Docking: Fix of title bar flicker during rebuild. Fixed dragging of DockNode always triggering BeginAsDockableDragDropSource() when io.ConfigDockingWithKeyMod is false.
|
2018-09-19 19:41:31 +02:00 |
|
omar
|
95d49c3b98
|
Docking: Internals renaming LastExplicitSize to SizeRef (invalidate .ini data) + todo
|
2018-09-19 18:25:26 +02:00 |
|
omar
|
455dc6e229
|
Docking: Creating tab bar and adding window into tab bar immediately (not sure why I didn't do that before). Probably broke something subtle, will find out. *Edit* Initially broke restoring selected tab.
|
2018-09-19 16:00:13 +02:00 |
|
omar
|
291bfe6841
|
Docking: work to allow programmatic control of dock nodes, various refactor + assert fix. Probably broke something (but I haven't found what yet!)
|
2018-09-19 16:00:13 +02:00 |
|
omar
|
35032d41fa
|
Docking: Internals: Transitioning some code toward consistently using ImGuiContext* ctx parameter instead of ImGuiDockContext
|
2018-09-17 17:06:52 +02:00 |
|
omar
|
28094b7cea
|
Docking: Fixed central docking display with ImGuiDockSpaceFlags_NoSplit, affecting in particular with io.ConfigDockingWithKeyMod = false. + comments, asserts
|
2018-09-17 15:39:35 +02:00 |
|
omar
|
b55b9aee9b
|
Fixed bad merge (a82be53) where we lost the version number in Docking branch + moved Docking related API together for now.
|
2018-09-14 18:09:46 +02:00 |
|
omar
|
0f1c21a6c9
|
Docking: Changed DockSpace() signature to take an ID, as ID will frequently be used by other API it makes more sense to let the user compute it.
|
2018-09-14 18:09:04 +02:00 |
|
omar
|
175bab4f5f
|
Docking: Removed SplitRatio from ImGuiDockNode and ImGuiDockNodeSettings, which we don't need anymore.
|
2018-09-14 17:51:30 +02:00 |
|
omar
|
ba7b68798d
|
Docking: Misc rework/rename toward being able to rebuild a branch selectively, so we can honor settings changes on a per Dockspace basis. + Comments
|
2018-09-14 16:01:47 +02:00 |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-14 11:38:10 +02:00 |
|
omar
|
132d8c5a99
|
Viewport: Increased threshold for setting ImGuiViewportFlags_NoFocusOnAppearing. (#1542), 2 doesn't seem enough with some docking setup.
|
2018-09-14 11:37:17 +02:00 |
|
omar
|
85a3fb3bef
|
Viewport: Fix an issue introduced on ~August 16, which would assert when viewport are disabled. Also made the DestroyPlatformWindow process more sturdy. (#1542)
|
2018-09-13 17:11:06 +02:00 |
|
omar
|
6d91055462
|
Docking: Fixed floating->docking transition on a platform window mistakenly destroying the platform window because the upcoming tab isn't visible and triggers viewport GC. Fixed missing title bar data on recreate window.
|
2018-09-13 16:56:57 +02:00 |
|
omar
|
136fc56af0
|
Docking: Better handling of window losing its dock node or having its dock node not active.
|
2018-09-13 14:38:37 +02:00 |
|
omar
|
c355ed1267
|
Docking: Flicker fix when clicking on a Tab leading of a new window, in particular would be noticeable when using nested tab bars.
|
2018-09-13 12:44:29 +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
|
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 |
|
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
|
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
|
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
|
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 |
|