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
|
eb311abc92
|
Fixed IMGUI_API tag on ImFontAtlas::IsBuilt() preventing to build as DLL on some setups. (#2226)
|
2018-12-03 17:49:38 +01:00 |
|
omar
|
8d58055a54
|
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
|
2018-12-03 17:47:10 +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
|
89a530b442
|
Somehow VS keeps modifying this GUID so I am going to playing along with it.
|
2018-12-03 11:44:08 +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
|
34e18ef771
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:48:39 +01:00 |
|
omar
|
8289e5f6b4
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:48:25 +01:00 |
|
omar
|
84238240d6
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:47:23 +01:00 |
|
omar
|
48f6fdb349
|
Fixed typo.
|
2018-11-30 18:30:21 +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
|
025e00cccc
|
About: Added build/system info relating to Docking branch.
|
2018-11-30 18:29:35 +01:00 |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
2018-11-30 18:27:14 +01:00 |
|
omar
|
ec49a486c7
|
About: Added build/system info relating to Viewport branch.
|
2018-11-30 18:27:04 +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 |
|
Sebastian Krzyszkowiak
|
3335e6688f
|
Include <alloca.h> also on macOS (and osxcross) (#2218)
|
2018-11-30 16:57:09 +01:00 |
|
Sebastian Krzyszkowiak
|
b2e7a3806a
|
Examples: Allegro5: Add touchscreen support
|
2018-11-30 16:54:30 +01:00 |
|
omar
|
1bfcf8f339
|
Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file.
|
2018-11-30 16:42:32 +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
|
4a94b251fd
|
Comments
|
2018-11-29 22:00:17 +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
|
01f940dc9a
|
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
|
2018-11-28 22:50:48 +01:00 |
|
omar
|
19c4fa8dd5
|
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
|
2018-11-28 15:43:00 +01:00 |
|
omar
|
3bcc25f588
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-11-27 19:56:23 +01:00 |
|
omar
|
4cadb57c46
|
Viewport: Comments.
|
2018-11-27 19:53:33 +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
|
1fa2cb8748
|
imgui.h: Comments
|
2018-11-27 14:10:40 +01:00 |
|
omar
|
ce07d55d1b
|
imgui.h: Moved ImGuiListClipper
|
2018-11-27 14:01:07 +01:00 |
|
omar
|
8495c931c0
|
mgui.h: Moved ImGuiInputTextCallbackData,, ImGuiSizeCallbackData, ImGuiPayload structures so they are not in the "Helpers" section.
|
2018-11-27 14:01:07 +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 |
|