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 |
|
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
|
510f0e505c
|
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
|
2018-11-22 20:13:55 +01:00 |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
d9c54826bb
|
Viewport: Stop relying on viewport->CreatedPlatformWindow to create Platform_DestroyWindow and Renderer_DestroyWindow. Explicitly require Platform_GetWindowFocus() to require supporting empty data.
|
2018-11-22 17:27:35 +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
|
cc4b1f9e47
|
Nav: Fixed explicit directional input not re-highlighting current nav item if there is a single item in the window and highlight has been previously disabled by the mouse. (#787)
|
2018-11-21 16:07:04 +01:00 |
|
omar
|
b9ae9bb1e3
|
Internals: Using GetOverlayDrawList(ImGuiWindow*) to match syntax of viewport/master branches. Fixed compiling with IMGUI_DEBUG_NAV_RECTS
|
2018-11-21 15:37:29 +01:00 |
|
omar
|
50c43d1c8e
|
Removed unnecessary ImGui:: prefixes.
|
2018-11-15 16:43:05 +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
|
f2d577c33f
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
2018-11-13 22:14:40 +01:00 |
|
omar
|
ae34241f8b
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
2018-11-13 22:11:39 +01:00 |
|
omar
|
1546153ca2
|
Docking: Fixed a regression where clicking a Tab wouldn't immediately set NavWindow. Which led to breaking the NavSaveLastChildNavWindow/NavRestoreLastChildNavWindow logic. (#2109)
|
2018-11-13 19:31:10 +01:00 |
|
omar
|
19b4fcdacb
|
Made IsWindowFocused() work outside of NewFrame()-EndFrame() and added comments about how ImGuiFocusedFlags_AnyWindow should NOT be used in place of io.WantCaptureMouse. (#2185)
|
2018-11-13 11:23:15 +01:00 |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
2018-11-06 09:52:38 +01:00 |
|
omar
|
797f2044cd
|
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)
|
2018-11-06 09:51:09 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
c808eb92c6
|
Config: Added IMGUI_DISABLE_WIN32_FUNCTIONS to disable linking with _any_ Win32 function, as a general forward compatible measure.
|
2018-11-05 17:28:00 +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
|
1a6eea012d
|
Docking: Tweaked tooltip on tabs so they don't show immediately when holding and releasing a tab (using HoveredIdNotActiveTimer) + Minor refactor + Removed legacy .ini parsing.
|
2018-10-25 23:41:32 +02:00 |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-25 23:41:13 +02:00 |
|
omar
|
12c72d2893
|
Fixed OpenGL texture loading example in comment + Discourse link to root of discourse
|
2018-10-25 21:32:29 +02:00 |
|
omar
|
a72d5ada61
|
Misc comments improvements
|
2018-10-25 19:02:43 +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
|
56ba60ee68
|
Docking: Fixed not saving .ini file correct if DockingEnable flag is cleared. (#2109)
|
2018-10-24 12:25:58 +02:00 |
|
omar
|
f270c81c49
|
Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. (#2109)
|
2018-10-23 18:26:45 +02:00 |
|
omar
|
745fda081e
|
Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. (#2109)
|
2018-10-23 18:26:35 +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
|
5be915d6ab
|
Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. (#1660, #787)
|
2018-10-15 18:23:18 +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
|
69db792bf0
|
Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. (#1542, #1660, #1878, etc.)
|
2018-10-15 17:38:36 +02:00 |
|
omar
|
e6cc547a94
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2018-10-12 15:51:31 +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
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
2018-10-12 15:48:38 +02:00 |
|
omar
|
28953208d4
|
Tests: Added imgui-test engine hooks (experimental).
|
2018-10-12 15:47:15 +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
|
33994bbfa1
|
Docking: Fixed Modal window from being dockable.
|
2018-10-12 12:56:56 +02:00 |
|
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
2018-10-12 12:34:47 +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
|
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
|
7525637804
|
Merge branch 'viewport' into docking. 15ec78e Fixes the update of title buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate().
# Conflicts:
# imgui.cpp
|
2018-10-11 21:36:00 +02:00 |
|
omar
|
15ec78e9d8
|
Internal: Moved stored window name update code to the first_begin_of_the_frame block. This will be useful in the Docking branch.
|
2018-10-11 21:32:20 +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
|
d02b11dfbd
|
ImGuiTextBuffer: Avoid heap allocation when empty.
|
2018-10-11 12:08:09 +02:00 |
|