omar
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
2018-12-20 23:06:29 +01:00 |
|
omar
|
d9fda22763
|
Viewport: Fixed not clearing request flags in main viewport, which led some back-end (SDL) to break on resize as PlatformRequestResize would stay true forever and inhibit new sizes passed to AddUpdateViewport(). (#1542)
|
2018-12-20 22:33:51 +01:00 |
|
omar
|
088ef6623a
|
Merge branch 'viewport' into docking
|
2018-12-18 15:03:01 +01:00 |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-12-18 15:02:35 +01:00 |
|
omar
|
ae76a1fda7
|
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
|
2018-12-18 15:01:15 +01:00 |
|
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2018-12-14 18:46:24 +01:00 |
|
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
2018-12-14 18:44:17 +01:00 |
|
omar
|
f1c7596409
|
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
|
2018-12-14 18:42:22 +01:00 |
|
omar
|
587506dd57
|
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
|
2018-12-14 11:27:02 +01:00 |
|
omar
|
067b691fd8
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2018-12-11 13:23:00 +01:00 |
|
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-11 12:41:40 +01:00 |
|
omar
|
54a60aaa40
|
Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
|
2018-12-11 12:36:47 +01:00 |
|
omar
|
15447f5b7b
|
Using named flags instead of 0 + shallow formatting tweaks from other branches.
|
2018-12-11 12:14:27 +01:00 |
|
omar
|
e6439e1a16
|
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-10 16:21:49 +01:00 |
|
omar
|
26b9e2d0a5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-12-10 16:14:31 +01:00 |
|
omar
|
d20e3ee710
|
Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.
|
2018-12-10 14:30:41 +01:00 |
|
omar
|
f768727284
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2018-12-06 16:36:17 +01:00 |
|
omar
|
a03846bd9e
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-06 16:33:39 +01:00 |
|
omar
|
125e62491e
|
Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.
|
2018-12-04 14:34:49 +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
|
f6b6ad1959
|
Viewport: Minor tweaks, better struct layout.
|
2018-12-03 20:30:00 +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
|
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
|
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
|
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
|
c08b4b46f4
|
Viewport: Better support for toggling ImGuiConfigFlags_ViewportsEnable. (#2196)
|
2018-11-27 19:46:36 +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
|
4a8efd7e68
|
Docking: Hidden tab-bar triangle reflects focus but using Button colors. (#2109)
|
2018-11-26 17:57:01 +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
|
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
|
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
|
760c1d95b9
|
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:13:07 +01:00 |
|
omar
|
0c4dee083c
|
Internals: Added ImPool helper data structure (used by testing system, and already in docking branch)
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
2515413080
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
|
2018-11-22 15:29:18 +01:00 |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-11-22 15:28:27 +01:00 |
|
omar
|
da3c4330c1
|
Version 1.66
|
2018-11-22 15:11:52 +01:00 |
|
omar
|
6b4443755d
|
Internals: Added FindWindowByID() helper. (#2190)
|
2018-11-15 16:41:48 +01:00 |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
2018-11-15 14:00:01 +01:00 |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-11-15 13:58:46 +01:00 |
|
omar
|
aa668c410a
|
Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. (#2168) + adding a else block to make NavCalcPreferredRefPos() more explicit.
|
2018-11-15 13:56:27 +01:00 |
|
omar
|
6c1ae6cc71
|
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
|
2018-11-09 14:41:40 +01:00 |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
2018-10-25 23:45:19 +02:00 |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-25 23:41:13 +02:00 |
|
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
2018-10-25 17:45:48 +02:00 |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:57:54 +02:00 |
|
omar
|
69db792bf0
|
Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. (#1542, #1660, #1878, etc.)
|
2018-10-15 17:38:36 +02:00 |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-10-12 15:50:48 +02:00 |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
2018-10-12 13:01:20 +02:00 |
|
omar
|
ed4dcd9072
|
Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()
|
2018-10-11 22:38:26 +02:00 |
|
omar
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
2018-10-11 12:53:10 +02:00 |
|
omar
|
1efafa1d29
|
Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)
|
2018-10-10 12:09:06 +02:00 |
|
omar
|
84507cc744
|
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)
|
2018-10-08 12:37:10 +02:00 |
|
omar
|
cb76c086e0
|
Docking: Removed context parameter from internal DockBuilderXXX api at it is expected we transition it to be public facing. (#2109)
|
2018-10-05 16:14:51 +02:00 |
|
omar
|
4e30698706
|
Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)
|
2018-10-03 22:32:23 +02:00 |
|
omar
|
d348d86df4
|
Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)
|
2018-10-03 17:50:07 +02:00 |
|
omar
|
bd82539ad5
|
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)
|
2018-10-03 14:42:47 +02:00 |
|
omar
|
46dff42239
|
Docking: Fixed dock node with single window accidental stealing of non-owned host viewport (leading to general havoc).
|
2018-09-30 19:30:51 +02:00 |
|
omar
|
876a3299fc
|
Docking: Added DockBuilderCopyDockspace() wip. Added DockBuilderCopyWindowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().
|
2018-09-28 17:58:55 +02:00 |
|
omar
|
93896d550e
|
Added FindOrCreateWindowSettings() internal helper.
|
2018-09-26 23:01:51 +02:00 |
|
omar
|
c0a89f8f4e
|
ImPool: Added Reserve() helper function.
|
2018-09-26 21:51:30 +02:00 |
|
omar
|
4053d9d638
|
Docking: Fixed tab order restoring (follow up to 67be485e, broken in 455dc6e2)
|
2018-09-26 17:11:37 +02:00 |
|
omar
|
45731cca19
|
Docking: Added DockBuilderForkNode() primitive for usage for user code to fork/copy entire layouts. This will probably need to be added to as I find ways to migrate patterns from user code to the library. Added IMGUI_DEBUG_DOCKING_INI helper to facilitate debugging. (+1 squashed commits)
|
2018-09-26 17:11:37 +02:00 |
|
omar
|
53a5d32df1
|
Docking: Reworked SetNextWindowUserType() as SetNextWindowDockFamily(), allowing multiple scene to be tagged with their scene id and not receive tabs from other scene + persistent storage for family id to allow for docking tree fork/remap.
|
2018-09-25 16:15:25 +02:00 |
|
omar
|
85e1e2b0c8
|
Docking: Added DockBuilderGetNode() wrapper for consistency.
|
2018-09-25 14:14:07 +02:00 |
|
omar
|
9960ccddb2
|
Docking: Added DockBuilderRemoveNode() + various tweaks. Fixed dragging/undocking dock node from CollapseButton.
|
2018-09-24 23:19:18 +02:00 |
|
omar
|
4021776d0f
|
Docking: Fix for undocking node where the dockspace node is attached to an immovable parent window. + Tweak .ini output.
|
2018-09-24 22:14:12 +02:00 |
|
omar
|
fa0ce4b7d5
|
Docking: Some DockBuilder functions are applied on settings data if windows are not present. Added DockBuilderCreateNode which needs a size else if we can't split properly. DockNodeTreeSplit() doesn't clamp SizeRef. (+1 squashed commits)
|
2018-09-24 16:38:44 +02:00 |
|
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
|
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
|
95d49c3b98
|
Docking: Internals renaming LastExplicitSize to SizeRef (invalidate .ini data) + todo
|
2018-09-19 18:25:26 +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
|
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
|
175bab4f5f
|
Docking: Removed SplitRatio from ImGuiDockNode and ImGuiDockNodeSettings, which we don't need anymore.
|
2018-09-14 17:51:30 +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
|
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
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +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
|
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 |
|