omar
|
8cac70d8af
|
Docking: Focus fix (missing line in 8bac6d4)
|
2018-12-04 13:34:16 +01:00 |
|
omar
|
5105c6c0d0
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2018-12-04 00:06:26 +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
|
8bac6d428d
|
Docking: Another attempt at tidying the inconsistent focus / tab bar reordering issues, and toward generalizing single window dock nodes. (#2109)
|
2018-12-04 00:01:20 +01:00 |
|
omar
|
2da200fc16
|
Docking: Fix generalizing the transition from loose windows to dock node so we can switch to single window dock node while transferring viewports (vs creating two viewports and dropping one). + Extracted DockContextGenNodeID out of DockContextAddNode().
|
2018-12-04 00:01:19 +01:00 |
|
omar
|
fb6ef8b1db
|
Comments, tweak
|
2018-12-03 23:50:59 +01:00 |
|
omar
|
f6b6ad1959
|
Viewport: Minor tweaks, better struct layout.
|
2018-12-03 20:30:00 +01:00 |
|
omar
|
3e84f7cd1d
|
Viewport: Fixed a viewport bug which led some popups to merge in underlying host viewport when they should be z-over their parent viewport.
|
2018-12-03 18:16:47 +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
|
ac10889bde
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2018-12-03 11:44:51 +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
|
7658035e5a
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
2018-11-30 18:30:21 +01:00 |
|
omar
|
3849def253
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
2018-11-30 18:30:21 +01:00 |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
2018-11-30 18:27:14 +01:00 |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
2018-11-30 18:24:43 +01:00 |
|
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
2018-11-30 18:18:15 +01:00 |
|
omar
|
4ef06f5aa2
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
2018-11-30 18:02:01 +01:00 |
|
omar
|
753223bd7b
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-11-30 14:38:54 +01:00 |
|
omar
|
f663277591
|
Merge misc/shallow changes from Docking branch to minimize drift: moved some blocks, added comments.
|
2018-11-30 14:35:13 +01:00 |
|
omar
|
1c7be88a1a
|
Viewport: Fixed a bug where tooltips on their first frame didn't find a monitor leading to the "recovery" code to revert it to the main viewport for a frame. (#1542)
|
2018-11-30 14:35:13 +01:00 |
|
omar
|
baf67d393f
|
When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. (#2213)
|
2018-11-29 23:25:29 +01:00 |
|
omar
|
3c114b280a
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
|
2018-11-29 21:30:26 +01:00 |
|
omar
|
2fbbcaa339
|
Viewport: Avoid calling platform functions when window is not created (apart from Platform_GetWindowDpiScale, documented as such). Main viewport situation is still ambiguous. (#1542)
|
2018-11-29 21:28:47 +01:00 |
|
omar
|
36cbe1e521
|
Viewport: Misc renaming.
|
2018-11-29 21:21:04 +01:00 |
|
omar
|
19d17ed274
|
Docking: Added io.ConfigDockingTransparentPayload option (to use with ImGuiConfigFlags_ViewportsNoMerge)
|
2018-11-29 16:18:01 +01:00 |
|
omar
|
3bcc25f588
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-11-27 19:56:23 +01:00 |
|
omar
|
99c32ed4a5
|
Merge branch 'master' into viewport
|
2018-11-27 19:46:40 +01:00 |
|
omar
|
c08b4b46f4
|
Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196)
|
2018-11-27 19:46:36 +01:00 |
|
omar
|
4105cc7e97
|
Added ImGuiConfigFlags_None, ImGuiBackendFlags_None for good measure.
|
2018-11-27 19:46:14 +01:00 |
|
omar
|
e138a5fcb5
|
Docking: Fixed debug Rebuild operation.
|
2018-11-27 17:40:25 +01:00 |
|
omar
|
fc16e54612
|
Docking: Maintain CentralNode. When SetNextWindowDockID() on a now split node id, we dig to find the central node or the last focused node. (#2109)
|
2018-11-27 13:35:05 +01:00 |
|
omar
|
4575354bc0
|
Docking: Comments + maiintain LastFrameFocused per node + using bitfiield for docking bools.
|
2018-11-27 13:29:09 +01:00 |
|
omar
|
3f51c831de
|
Docking: Added internal DockBuilderGetCentralNode(). Fixed being unable to undock whole node from dock button in DockSpace with a central node. (#2109)
|
2018-11-26 22:18:55 +01:00 |
|
omar
|
962dcb466d
|
Docking: Added ImGuiDockNodeFlags_NoResize. (#2109)
|
2018-11-26 21:52:40 +01:00 |
|
omar
|
b8d9c5c130
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2018-11-26 21:36:48 +01:00 |
|
omar
|
1a0d2578a1
|
Viewport: Merging fixes + relying on multiple viewport overlaps. Follow-up to previous attempts are reworking the split/merge mechanisms. (#1542)
|
2018-11-26 21:35:44 +01:00 |
|
omar
|
4a8efd7e68
|
Docking: Hidden tab-bar triangle reflects focus but using Button colors. (#2109)
|
2018-11-26 17:57:01 +01:00 |
|
omar
|
66cfbbff5e
|
Docking: Fixed double-overlay when dragging window over one of the (four cardinal) outer drop boxes. (#2109)
|
2018-11-26 17:39:38 +01:00 |
|
omar
|
d23c69d319
|
Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. (#2109)
|
2018-11-26 17:25:06 +01:00 |
|
omar
|
1e7b50aeae
|
Viewport: Fixes moving child menu viewport (fix 379733a).
|
2018-11-26 16:56:58 +01:00 |
|
omar
|
c93e92671a
|
Viewport: Fixes moving child menu viewport (fix 379733a).
|
2018-11-26 16:55:40 +01:00 |
|
omar
|
ddc3f8f069
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2018-11-26 15:32:04 +01:00 |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-11-26 14:53:51 +01:00 |
|
omar
|
379733aba1
|
Viewport: Fix viewport regression with protruding child window creating their own viewport. (fixes cae4d02, 760c1d95) (#1542)
|
2018-11-26 14:53:04 +01:00 |
|
omar
|
131de7ab62
|
Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109)
|
2018-11-23 18:42:16 +01:00 |
|
omar
|
d8ab2c1ac9
|
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo
|
2018-11-23 16:55:33 +01:00 |
|
omar
|
862781b195
|
Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)
|
2018-11-23 16:35:17 +01:00 |
|
omar
|
cae4d020dc
|
Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542)
|
2018-11-22 21:18:14 +01:00 |
|
omar
|
1f78e08427
|
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
|
2018-11-22 21:16:43 +01:00 |
|