omar
|
565af90958
|
Merge branch 'viewport' into docking
|
2018-11-06 09:52:38 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
Torkel Bjørnson-Langen
|
1441756a0f
|
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() (#2153)
|
2018-11-05 14:17:51 +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
|
f3e642322f
|
Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.
|
2018-10-25 23:40:33 +02:00 |
|
omar
|
eed1fba157
|
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. (#2152)
|
2018-10-25 23:34:05 +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
|
c547b2e8ee
|
Added DockSpaceOverViewport() call, not sure about this because of the menu bar limitation. (#2109)
|
2018-10-25 15:34:53 +02:00 |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:57:54 +02:00 |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:56:26 +02:00 |
|
omar
|
000c1fc221
|
Demo: Added comments / tweaks related to the popups.
|
2018-10-16 10:25:32 +02:00 |
|
omar
|
90b50bd4c3
|
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660)
|
2018-10-15 18:16:49 +02:00 |
|
omar
|
8b956216b7
|
Demo: Testing return value of BeginTabBar() for consistency.
|
2018-10-15 17:19:52 +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
|
0fe48cbb61
|
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035, #2096)
Added misc/README file.
|
2018-10-12 11:16:51 +02:00 |
|
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:35:45 +02:00 |
|
omar
|
7b3433c68b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:33:39 +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
|
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
|
2dd8338e7d
|
Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109)
|
2018-10-03 18:30:36 +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
|
1d3862b6b3
|
Docking: Added ImGuiDockNodeFlags_NoDockingInsideDocRootNode flag. Honoring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. (#2109)
|
2018-10-03 14:57:28 +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
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
2018-10-01 18:35:21 +02:00 |
|
omar
|
9cfc40c2cc
|
Docking: Demo: Displaying a message if master docking flag is disabled. + DockSpace() early out + comments.
|
2018-09-30 23:39:37 +02:00 |
|
omar
|
35d1fb7b34
|
Style: Added style.TabRounding setting.
|
2018-09-30 18:41:07 +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
|
d3e8e5731a
|
Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().
|
2018-09-25 17:45:06 +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
|
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
|
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
|
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
|
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
|
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
|
b872aa5c8e
|
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
|
2018-09-10 11:24:27 +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
|
bd5b38e232
|
Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) (#351)
|
2018-09-06 21:45:46 +02:00 |
|
omar
|
58d46e1fe6
|
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261, #351)
|
2018-09-06 21:45:44 +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
|
a2616c79fe
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-09-06 11:42:11 +02:00 |
|