omar
|
c0a89f8f4e
|
ImPool: Added Reserve() helper function.
|
2018-09-26 21:51:30 +02:00 |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
2018-09-26 21:35:09 +02:00 |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
61d94ff88e
|
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
|
2018-09-26 21:30:37 +02:00 |
|
omar
|
a7d3ae8937
|
BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698, #894, #713) + reworked the Begin/BeginChild comments in imgui.h.
|
2018-09-26 21:24:42 +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
|
dc92431328
|
Docking: Minor renaming. DockContextAddNode() uses 0 as marker for automatic ID selection + TODO update and moved docking entries to docs/TODO.txt
|
2018-09-26 12:58:14 +02:00 |
|
omar
|
d3e8e5731a
|
Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().
|
2018-09-25 17:45:06 +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
|
781a7950d7
|
ImVector: Fixed a oddly unqualified return type in the assignment operator (I assume C++ handles it nicely as this never warned anywhere, but it is completely unintentional).
|
2018-09-24 11:33:26 +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
|
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
|
1127804109
|
Viewport: Misc tweaks.
|
2018-09-24 10:39:15 +02:00 |
|
omar
|
788febf044
|
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097)
|
2018-09-24 10:13:01 +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
|
5719b23e01
|
ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty.
|
2018-09-21 10:00:26 +02:00 |
|
omar
|
7abc368927
|
Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542)
|
2018-09-20 18:46:36 +02:00 |
|
omar
|
7c3b9172ad
|
Examples: Referring to missing gamepad support in back-end that are missing it.
|
2018-09-20 10:37:55 +02:00 |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
2018-09-20 10:31:23 +02:00 |
|
omar
|
3d318a6577
|
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
|
2018-09-20 10:24:29 +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
|
0b190f11b9
|
Contributing, Issue Template
|
2018-09-18 18:04:32 +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
|
571676ebd2
|
Added Fonts readme details and links to Sweet16 font. (#2085)
|
2018-09-17 13:16:32 +02:00 |
|
Tesla Ice Zhang
|
4b353ce482
|
Fix file names (#2083)
|
2018-09-15 21:41:07 +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
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
c12da2a607
|
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
|
2018-09-14 11:28:08 +02:00 |
|
omar
|
ca5dc0c019
|
ColorPicker: Replaced the Separator with a Spacing call. (#2068)
|
2018-09-14 10:05:53 +02:00 |
|