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
omar
1efafa1d29
Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)
2018-10-10 12:09:06 +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
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
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
83f55c9de5
Merge branch 'viewport' into docking
2018-10-02 18:55:48 +02:00
omar
33b88a0339
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-10-02 18:55:36 +02:00
omar
fbfe193fcd
Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. ( #2110 )
2018-10-02 18:49:55 +02:00
omar
ae7f833c69
Window: Resizing from edges (with io.ConfigResizeWindowsFromEdges Beta flag) extends the hit region of root floating windows outside the window, making it easier to resize windows. Resize grips are also extended accordingly so there are no discontinuity when hovering between borders and corners. ( #1495 , #822 , #2110 )
2018-10-02 18:43:10 +02:00
omar
44bfa24cc3
Docking: Fixed crash using DockBuilderSplitNode(). ( #2109 )
2018-10-02 11:09:53 +02:00
omar
2cff3f6a65
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
2018-10-01 18:35:21 +02:00
omar
e623be998d
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. ( #143 )
2018-10-01 15:53:18 +02:00
omar
b48ed9ebc0
Docking: Better tracking of current dock id for inactive and uncreated windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another
2018-10-01 11:56:26 +02:00
omar
4e717b524c
Docking: Fixes for C++03 compilers.
2018-10-01 10:40:43 +02:00
omar
ae657a349a
Docking: Fixed extracting a dock node from a document root: document root should be preserved.
2018-09-30 23:39:38 +02:00
omar
ed3c015f4e
Docking: Reorganizing some of the tab-bar selection and window focus related code.
2018-09-30 23:39:38 +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
6ebc63d3ef
Docking: Various sanity fixes + fixed tab-bar items sorting issue when docking single window with a dock node into single window without dock node.
2018-09-30 22:07:57 +02:00
omar
1ae0a1e658
Docking: Fix DockContextRebuild() temporarily invalidating dockid reference leading to undesirable merging of nodes.
2018-09-30 19:34:03 +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
35d1fb7b34
Style: Added style.TabRounding setting.
2018-09-30 18:41:07 +02:00
omar
876a3299fc
Docking: Added DockBuilderCopyDockspace() wip. Added DockBuilderCopyWindowSettings(), renamed DockBuilderForkNode() to DockBuilderCopyNode().
2018-09-28 17:58:55 +02:00
omar
3dcd552628
Fixed extraneous static attribute. ( #2105 )
2018-09-27 13:01:51 +02:00
Loïc HAMOT
9aae21483a
Fix missing IMGUI_API and mismatching namespace internal's CreateNewWindowSettings ( #2105 )
2018-09-27 12:59:22 +02:00
omar
93896d550e
Added FindOrCreateWindowSettings() internal helper.
2018-09-26 23:01:51 +02:00
omar
18ffb7dd86
Docking: Reworked DockContextPruneUnusedSettingsNodes() to prune entire unused trees.
2018-09-26 23:01:51 +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
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
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
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
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
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
85a3fb3bef
Viewport: Fix an issue introduced on ~August 16, which would assert when viewport are disabled. Also made the DestroyPlatformWindow process more sturdy. ( #1542 )
2018-09-13 17:11:06 +02:00
omar
6d91055462
Docking: Fixed floating->docking transition on a platform window mistakenly destroying the platform window because the upcoming tab isn't visible and triggers viewport GC. Fixed missing title bar data on recreate window.
2018-09-13 16:56:57 +02:00
omar
136fc56af0
Docking: Better handling of window losing its dock node or having its dock node not active.
2018-09-13 14:38:37 +02:00
omar
c355ed1267
Docking: Flicker fix when clicking on a Tab leading of a new window, in particular would be noticeable when using nested tab bars.
2018-09-13 12:44:29 +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
f29b3b4033
Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. ( #1542 , #787 )
2018-09-11 15:35:53 +02:00
omar
df65d4a14f
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-09-11 11:18:46 +02:00
omar
c4e26f4b92
Nav: Added a way for code to cancel Alt for menu toggle (ImGuiNavInput_KeyMenu_). Cancelling out on platform window. close request. ( #1542 , #787 )
2018-09-10 22:19:54 +02:00
omar
416918429d
Docking: Added Type enum in ImGuiDockRequest. Renamed fields. DockSpace() skips node update if already submitted (when transitioning from implicit -> explicit DockSpace).
2018-09-10 22:09:43 +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
b872aa5c8e
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
2018-09-10 11:24:27 +02:00
omar
062b1f0463
Fixed calling SetNextWindowSize()/SetWindowSize() with non-integer values leading to accidental alteration of window position. We now round the provided size. ( #2067 )
2018-09-07 22:30:46 +02:00
omar
2eaf722fd7
Fixed calling DestroyContext() always saving .ini data with the current context instead of the supplied context pointer. ( #2066 )
2018-09-07 17:24:56 +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
e381f22ac1
Docking: Added Docking system. (Part 3) ( #351 )
2018-09-06 21:45:46 +02:00
omar
9ac1e93aa1
Docking: Added Docking system. (Part 2) ( #351 )
2018-09-06 21:45:46 +02:00
omar
5adcb9ce6d
Docking: Added empty skeleton/sections to facilitate diff/patch of incoming code (otherwise git gives us a messier patch).
2018-09-06 21:45:45 +02:00
omar
2ec135c9f7
Docking: Added ImVec2[] non const operator. Added ImStrSkipBlank. Reseting some values earlier in Begin. Added IMGUI_DEBUG_LOG() helper. Added docking source code section.
2018-09-06 21:45:45 +02:00
omar
58d46e1fe6
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. ( #261 , #351 )
2018-09-06 21:45:44 +02:00
omar
741bdf151a
Added ImGuiWindowFlags_UnsavedDocument flags.
2018-09-06 21:45:10 +02:00
omar
5070c769b8
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
2018-09-06 21:45:09 +02:00
omar
52e0de84a9
Internals: Split RenderTextClipped into two functions.
2018-09-06 21:45:09 +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
5a679a45cc
Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. ( #1718 , #2036 )
...
If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
2018-09-06 15:58:25 +02:00
omar
a2616c79fe
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-06 11:42:11 +02:00
omar
e58bc3d5b7
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
0b18c11440
Refactor: Moved ImFile functions. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
ab64e8f993
Refactor: Moved one indentation level in the bulk of the ShowMetricsWindow() function. Should appear as a small diff if whitespaces changes are ignored. ( #2036 )
2018-09-06 11:36:00 +02:00
omar
31b5b18611
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-09-05 20:59:27 +02:00
omar
bb3184af74
Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )
2018-09-05 20:54:28 +02:00
omar
cbdce80837
Internals: Refactor: Moved render functions to their own section. ( #2036 )
2018-09-05 20:46:57 +02:00
omar
8601c39571
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. ( #1542 )
2018-09-05 17:50:55 +02:00
omar
af27ec296b
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-09-05 17:38:47 +02:00
omar
65876f348a
Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. ( #787 )
2018-09-05 17:33:00 +02:00
omar
77ba883f23
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.
2018-09-05 17:29:47 +02:00
omar
bbcc976739
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
2018-09-05 17:29:47 +02:00
omar
b944aa623c
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
2018-09-05 11:52:48 +02:00
omar
a848807847
Minor inconsequential merges from Master/Docking branches
2018-09-05 11:51:45 +02:00
omar
bdb30d7145
Merge branch 'master' into viewport
2018-09-05 11:08:57 +02:00
omar
897e5c6231
Viewport: Moved code following refactor. ( #2036 , #1542 )
2018-09-05 11:08:44 +02:00
omar
40db2ca098
Fixed a build issue with non-Cygwin GCC under Windows.
2018-09-04 18:58:20 +02:00
omar
1007873d94
Misc: merge minor/inconsequential stuff from Docking branch to reduce drift.
2018-09-03 19:51:22 +02:00
omar
bcb1441ce7
Version 1.65 WIP
2018-09-03 14:38:04 +02:00
omar
fd201a90f1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-08-31 18:39:02 +02:00
omar
5d40d295b3
Comments, readme updates
2018-08-31 11:37:14 +02:00
omar
fd90afef43
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 3) ( #2036 , #1542 )
2018-08-31 11:11:18 +02:00
omar
5207afa0dd
Refactor: Internals: Moved Viewport functions in imgui.cpp in their own section. (part 2) ( #2036 , #1542 )
2018-08-31 11:06:21 +02:00
omar
0c24fe276c
Merge branch 'master_164' into viewport_164
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
2018-08-31 10:28:21 +02:00
omar
48db5713d6
Version 1.64
2018-08-31 10:00:03 +02:00
omar
38cfcf9fbc
Tweak comments and indexes
2018-08-31 09:59:58 +02:00
omar
c83391262e
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )
2018-08-30 21:21:14 +02:00
omar
00262d51ad
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )
2018-08-30 21:19:30 +02:00
omar
d7c04ccbfb
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )
2018-08-30 21:18:16 +02:00
omar
b1f263b34b
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )
2018-08-30 21:16:30 +02:00
omar
a58e4dfd0f
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
2018-08-30 21:16:23 +02:00
omar
8a216fe756
Refactor: Internals: Moved Tooltip functions in imgui.cpp in their own section + comments. ( #2036 )
2018-08-30 21:15:12 +02:00
omar
fd2bfb7e07
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 3) ( #2036 )
2018-08-30 21:00:51 +02:00
omar
064b949bc2
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 2) ( #2036 )
2018-08-30 20:59:24 +02:00
omar
2a0d26e603
Refactor: Internals: Moved Popup functions in imgui.cpp in their own section. (part 1) ( #2036 )
2018-08-30 20:58:36 +02:00
omar
df37a156e8
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
2018-08-30 20:51:57 +02:00
omar
346f83e014
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) ( #2036 , #787 )
2018-08-30 19:41:02 +02:00
omar
fefcc77f13
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) ( #2036 , #787 )
2018-08-30 19:40:40 +02:00
omar
b6cdfef442
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) ( #2036 , #787 )
2018-08-30 19:38:44 +02:00
omar
172e426ba9
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) ( #2036 , #787 )
2018-08-30 19:36:59 +02:00
omar
f74d9ec7f7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) ( #2036 , #787 )
2018-08-30 19:36:40 +02:00
omar
9093166eea
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) ( #2036 , #787 )
2018-08-30 19:35:19 +02:00
omar
f5ed5478e1
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) ( #2036 , #787 )
2018-08-30 19:35:12 +02:00
omar
9a4234ea8e
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) ( #2036 , #787 )
2018-08-30 19:35:06 +02:00
omar
af002dc861
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) ( #2036 , #787 )
2018-08-30 19:34:48 +02:00
omar
adeb993122
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:33:02 +02:00
omar
81bc4265e5
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:32:52 +02:00
omar
a44c5f7afe
Refactor: Internals: Moved various functions in imgui.cpp ( #2036 )
2018-08-30 19:30:17 +02:00
omar
728b2ef026
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. DONE! (part 9) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
cda45737ab
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 8) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
acf3cc4c3f
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 7) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
8a6fd237f6
Refactor: Internals: Restored new lines in NavUpdate() ... (part 6) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
84eb2682b7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (moved NavUpdate which would not diff properly unless empty lines were removed, hence the previous patch). (part 5) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
73052dc00c
Refactor: Internals: Removing new lines from NavUpdate solely because I couldn't find another way to get a neat diff/patch when moving it. (part 4) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
6bda59e5b7
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section (extracted some code out of NavUpdate()). (part 3) ( #2036 , #787 )
2018-08-30 19:23:11 +02:00
omar
60ee4de56d
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 2) ( #2036 , #787 )
2018-08-30 19:23:10 +02:00
omar
ce58795bdf
Refactor: Internals: Moved Navigation functions in imgui.cpp in their own section. (part 1) ( #2036 , #787 )
2018-08-30 19:23:10 +02:00
omar
f2926f910f
Refactor: Internals: Moved Logging functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:23:10 +02:00
omar
15172f0742
Refactor: Internals: Moved Settings functions in imgui.cpp in their own section. ( #2036 )
2018-08-30 19:23:10 +02:00
omar
98f618ed18
Refactor: Internals: Moved various functions in imgui.cpp ( #2036 )
2018-08-30 19:23:10 +02:00
omar
521405488b
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:21:50 +02:00
omar
24dfa0c957
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:12:33 +02:00
omar
158a65c98f
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:49 +02:00
omar
6caf074bd5
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:42 +02:00
omar
905e14f384
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:36 +02:00
omar
4be79a8955
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:04:04 +02:00
omar
2d952504ed
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:01:05 +02:00
omar
43219d36a6
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:00:59 +02:00
omar
99b27488e7
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 19:00:52 +02:00
omar
6c34bffbb5
Version 1.64 WIP
2018-08-30 19:00:22 +02:00
omar
2714f8fa23
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:46 +02:00
omar
c25f48b902
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:46 +02:00
omar
ad0bfdcd95
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
5dc954f5d7
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
a265c62636
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:45 +02:00
omar
0e9577d0da
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 15:40:44 +02:00
omar
f26b8c1e07
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:55:27 +02:00
omar
6468a3c0ce
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:50:32 +02:00
omar
3eaa063984
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
2018-08-30 14:50:32 +02:00
omar
f2aa124eb8
Version 1.64 WIP
2018-08-30 14:25:23 +02:00
omar
36b2f64051
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2018-08-29 17:40:52 +02:00
omar
9e0f24dcb6
Version 1.63
2018-08-29 16:20:25 +02:00
omar
92edb7a4e3
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
2018-08-29 16:12:54 +02:00
omar
2598d26c73
ColorEdit4: Fixed a bug when text input or drag and drop leading to unsaturated HSL values would erroneously alter the resulting color. ( #2050 )
2018-08-29 13:30:46 +02:00
omar
f9634feb66
Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR ( #846 )
2018-08-28 19:10:59 +02:00
omar
f81caac459
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
2018-08-25 21:19:42 +02:00
omar
e9c849884a
Viewport: Fixed warnings due to bad merge.
2018-08-24 15:42:31 +02:00
omar
06e917f135
Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. ( #2034 , #820 , #956 , #1875 )
2018-08-23 13:47:37 +02:00
omar
0810d57819
Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). ( #820 , #956 , #1875 , #2034 )
2018-08-23 13:26:14 +02:00
omar
e28b1078f5
Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. ( #2034 )
2018-08-23 13:21:01 +02:00
omar
abaa274592
Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. ( #2034 )
2018-08-22 22:31:51 +02:00
omar
102d5e6de6
Rearrange header comments to find enums easily + fixed inconsistent sorting.
2018-08-22 22:13:05 +02:00
omar
a4191857c1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
2018-08-22 21:35:44 +02:00
omar
7011d87bf8
InputText: Improved sturdiness if the ResizeCallback purposefully modify data->BufTextLen or data->BufSize. ( #2006 , #1443 , #1008 )
2018-08-22 21:27:27 +02:00
omar
7d9d9bc34e
InputText: Fix ResizeCallback callback on restoring initial value with Escape key. Avoid over-allocating for InitialText storage. ( #2006 , #1443 , #1008 )
2018-08-22 21:11:55 +02:00
omar
ea9f5d7600
Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). ( #2035 , #2006 , #1443 , #1008 )
2018-08-22 13:25:08 +02:00
omar
8d639ec60d
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259
) + fixed demo to use those functions. ( #2006 , #1443 , #1008 ).
2018-08-22 13:09:44 +02:00
omar
ea1906004b
InputText: Fixed a few pathological crash cases on single-line InputText widget with multiple millions characters worth of contents. Because the current text drawing function reserve for a worst-case amount of vertices and how we handle horizontal clipping, we currently just avoid displaying those single-line widgets when they are over a threshold of 2 millions characters, until a better solution is found.
2018-08-22 12:46:47 +02:00
omar
5122c76441
InputText: Fixed not tracking the cursor horizontally When modifying the text buffer through a callback.
2018-08-22 12:46:47 +02:00
omar
68448c5faa
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
2018-08-22 12:46:47 +02:00
omar
2dc5ec95d7
Internals: InputText: Renaming. Comments.
2018-08-22 12:46:46 +02:00
omar
9f393c38e9
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
2018-08-22 12:46:45 +02:00
omar
24ff259816
InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. ( #2006 , #1443 , #1008 ).
2018-08-21 21:36:07 +02:00
omar
4de6e1f7e4
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
2018-08-21 15:14:10 +02:00
omar
0fd6e9bc0d
InputText: Fixed minor off-by-one issue when submitting a buffer size smaller than the initial zero-terminated buffer contents.
2018-08-21 14:27:57 +02:00
omar
e6c78f9470
InputText: (Breaking change) removed ImGuiTextEditCallbackData::ReadOnly since it is a duplication of (ImGuiTextEditCallbackData::Flags & ImGuiInputTextFlags_ReadOnly) ( #211 )
2018-08-21 14:27:57 +02:00
omar
5942c08143
Added IMGUI_VERSION_NUM for easy compile-time testing. ( #2025 )
2018-08-21 14:27:57 +02:00
omar
f23d29b481
Added links to Discourse forums.
2018-08-20 10:45:10 +02:00
omar
4910629f6a
Internals: Moved code out of SliderBehaviorT to reduce code bloat and also because caller may have use for the grab_bb for styling purposes.
2018-08-20 09:59:51 +02:00
omar
9d7480774f
Merge branch 'master' into viewport
2018-08-17 11:37:03 -07:00
omar
bb2de30e3e
Internals: Added ImTextCountUtf8BytesFromChar() helper.
2018-08-17 11:33:45 -07:00
omar
ac39c4b2a8
SplitterBehavior: Fix for when the sizes are already under the minimum desired size.
2018-08-17 11:33:40 -07:00
omar
341ebd961b
Fixed assertion when transitioning from an active ID to another within a group, affecting ColorPicker (broken in 1.62). Made ActiveIdIsAlive track the actual ID to avoid incorrect polling in BeginGroup/EndGroup when the ID changes within the group. ( #2023 , #820 , #956 , #1875 ).
2018-08-16 13:33:16 -07:00
omar
8972ebae73
Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. ( #1565 , #1599 , #586 )
2018-08-15 16:28:39 -07:00
omar
5d630c930d
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). ( #1542 )
2018-08-15 16:15:44 -07:00
omar
9852649e97
Viewport: Initial viewport DpiScale only queried on viewport creation. Because AddUpdateViewport() is called repeatedly on MovingWindow or with ImGuiConfigFlags_ViewportsNoMerge, the DpiScale update would break ImGuiConfigFlags_DpiEnableScaleViewports. ( #1542 )
2018-08-14 19:17:33 -07:00
omar
1722a31155
Viewport: ImGuiWindowFlags_NoFocusOnAppearing affects viewport accordingly. ( #1542 )
2018-08-14 14:58:19 -07:00
omar
e5f2295398
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2018-08-13 17:50:48 -07:00
omar
caaa746424
Nav: NavWindowingList doesn't save to .ini file. TODO entries.
2018-08-13 17:29:20 -07:00
omar
fda9dc8e18
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. ( #2013 )
2018-08-09 18:07:49 +02:00
omar
421dc19798
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. ( #2015 )
2018-08-09 17:49:48 +02:00
omar
d5793102db
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. ( #2002 , #1873 )
2018-08-09 17:42:53 +02:00
omar
0065fe16a2
Nav: Made CTRL+TAB skip menus + skip the current navigation window if is has the ImGuiWindow_NoNavFocus set. ( #787 )
...
While it was previously possible, you won't be able to CTRL-TAB out and immediately back in a window with the ImGuiWindow_NoNavFocus flag.
2018-08-08 16:03:13 +02:00
omar
9d8a0374d3
Use literals in place of LLONG_MIN, LLONG_MAX ULLONG_MAX if they are not available. Amend 498c0dcb4c
. We prefer using the defines if available in limits.h because they somehow tend to work without warnings when enabling strict C++03 compilation. The 3 literals are fallbacks.. ( #1926 ).
2018-08-06 13:07:19 +02:00
omar
0905202f44
Internals: Minor renaming for consistency.
2018-08-05 18:13:24 +02:00
omar
bc6ac8b2ae
Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame.
...
Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.
2018-08-03 18:12:36 +02:00
omar
498c0dcb4c
Using limits.h LLONG_MIN etc. to increase old-compiler compatibility (as ll and ull prefixes were not standard). Not tested much on old compilers, relying on Clang/GCC warnings.
2018-08-03 11:41:07 +02:00
omar
8ef0ca9765
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2018-08-01 12:27:56 +02:00
omar
87e2fea09d
Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. ( #1427 , #1495 , #822 , #473 , #650 )
...
Demo: Exposed flags in Demo.
2018-08-01 11:50:57 +02:00
omar
65b46f62ef
Fixed PushID() from keeping alive the new ID Stack top value (if a previously active widget shared the ID it would be erroneously kept alive) (drag and drop demo could soft-lock the UI until pressing Escape!)
2018-07-31 17:28:18 +02:00
omar
7e1678ff00
Drag and Drop: Elapse payload as soon as delivery is made. ( #153 )
2018-07-31 17:28:08 +02:00
omar
c031ea088a
Viewport: Fixed an assert on loss of valid mouse position while dragging a tooltip (would happen often when using debugger breakpoint). Not totally sure about best solution, may not be important.
2018-07-31 13:46:37 +02:00
omar
faf2c34149
Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. ( #1725 , #143 ).
2018-07-31 13:46:19 +02:00
omar
79ae6d3bf6
Drag and Drop: Clear payload buffers more consistently in ClearDragAndDrop() + BeginDragDropTargetCustom() can't succeed with hidden contents. ( #143 )
2018-07-31 13:45:25 +02:00
omar
9824bf1ba1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
2018-07-31 12:12:56 +02:00
omar
e13e5982ff
Drag and Drop: Payload stays available and under the mouse if the source stops being submitted, however the tooltip is replaced by "..." + moved FrameScopeActive = false at the bottom of EndFrame() for safety. ( #1725 )
2018-07-31 12:11:18 +02:00
omar
f88bf9cea3
InvisibleButton: Added an assert to catch common type of passing zero-sized dimensions. ( #1983 )
2018-07-30 18:48:10 +02:00
omar
a7ac9e8346
Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. ( #1987 )
2018-07-30 18:20:25 +02:00
omar
4d5dcdb57a
Internals: Changed signature of ShadeVerts functions to remove pointers. ( #1286 , #1700 , #1986 )
2018-07-30 17:24:04 +02:00
omar
f05aede098
Revert "Assert that fmt != NULL before calling vsnprintf ( #1969 )"
...
This reverts commit 84183f5bb6
.
2018-07-30 16:50:47 +02:00
omar
80db2383d8
Speculative va_copy() fix for old versions of GCC/Clang. (cannot repro) ( #1085 )
2018-07-30 16:01:06 +02:00
omar
2a67aeaa3d
Visual Studio: calling into _vsnprintf. ( #1085 )
2018-07-30 16:01:06 +02:00
omar
15a93d6fe3
Internals: Fixed HoveredIdTimer so it is safe to call SetHoveredId() multiple times without altering the timer.
2018-07-30 14:36:33 +02:00
omar
f9e8b5c652
CollapseButton: Added hovering highlight + minor consistency tweaks.
2018-07-27 13:32:33 +02:00
omar
6211f40f3d
Internals: Drag and Drop: default drop preview use a narrower clipping rectangle (no effect here, but other branches uses a narrow clipping rectangle that was too small so this is a fix for it) + Comments
2018-07-27 12:39:42 +02:00
omar
0095b7a0ea
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-07-26 23:55:23 +02:00
omar
28c1a9857e
Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. ( #319 ).
2018-07-26 23:50:05 +02:00
omar
63df9d6311
Internals: Extracted part of Begin into UpdateWindowParentAndRootLinks(). Useful to call to keep state updated immediately (namely useful for docking) + small tidying up of imgui_internal.h
2018-07-26 23:49:36 +02:00
OswaldHurlem
84183f5bb6
Assert that fmt != NULL before calling vsnprintf ( #1969 )
...
In the case of Visual Studio 15.6 + Windows SDK 10.0, vsnprintf() with NULL format string appears to corrupt the stack...
2018-07-26 22:26:50 +02:00
omar
6b4f6cd2c5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-26 19:25:55 +02:00
omar
dd0d5debef
Internals: Child windows that are clipped or part of a collapsed parent are not marked as collapsed anymore, but just a separate hidden marker set. We distinguish hiding for size measurement vs hiding for other reasons. Cleaned a little the end of Begin.
2018-07-26 19:24:27 +02:00
omar
0b045d8de5
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
2018-07-26 19:03:02 +02:00
omar
1b646a4440
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
2018-07-26 19:01:51 +02:00
omar
7adac4ab3e
FAQ update
2018-07-26 12:55:40 +02:00
omar
0c88fad6c2
Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. ( #319 )
2018-07-25 16:07:05 +02:00
omar
f22024cb19
Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h
2018-07-24 16:54:29 +02:00
omar
352695bc57
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
2018-07-24 16:50:49 +02:00
omar
357534e588
Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.
2018-07-24 16:45:11 +02:00
omar
3a522b2400
Internals: Renamed one of the arrow functions so their name don't collide.
2018-07-24 16:41:17 +02:00
omar
528b50a89f
Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. ( #1463 , #1380 , #1502 )
2018-07-22 19:04:15 +02:00
omar
4b8ce24e46
Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function.
2018-07-22 18:57:28 +02:00
omar
4ebd442a24
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). ( #1958 )
2018-07-22 18:53:27 +02:00
omar
e07f5d4c78
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
2018-07-22 18:46:41 +02:00
omar
74077491ce
Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. ( #1542 )
2018-07-22 16:24:06 +02:00
omar
048add5ef2
ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. ( #1879 )
2018-07-19 15:22:18 +02:00
omar
23b67e6ff5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-17 19:52:14 +02:00
omar
93321d3280
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. ( #787 )
2018-07-17 19:48:53 +02:00
Rokas Kupstys
7e59eb026b
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. ( #1950 )
2018-07-17 17:17:56 +02:00
omar
7b4fbf4301
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. ( #1542 )
2018-07-17 16:37:10 +02:00
omar
b8b74970d7
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. ( #1542 )
2018-07-17 16:04:47 +02:00
omar
defbf1c4b3
Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. ( #1542 )
2018-07-17 15:56:02 +02:00
omar
16c6734bcb
Viewport: Revert part of 7abf72e
, the viewport ownership stealing is problematic. ( #1542 ). Will rework in the context of docking. (+1 squashed commits)
...
+ Fixed unused prototype warning (left-over from a merge)
2018-07-17 15:14:19 +02:00
omar
b30b82835a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2018-07-12 11:48:49 +02:00
omar
d107146687
Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48
for viewport branch)
2018-07-12 11:19:17 +02:00
omar
5e73e969fb
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
2018-07-12 11:08:24 +02:00
omar
88df66ec83
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
2018-07-12 10:03:18 +02:00
omar
23288547ec
Revert part of c7016c2
incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939 )
2018-07-12 09:53:10 +02:00
omar
9007dff5eb
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. ( #1940 , #211 )
...
+ shallow changelog tweaks
2018-07-10 19:16:57 +02:00
omar
b829671df1
Fixed missing value in GetStyleColorName(). ( #1939 ) broken with c7016c2
2018-07-10 16:45:54 +02:00
omar
4dfb9ef751
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
2018-07-10 11:16:40 +02:00
omar
ce18371d1b
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
2018-07-09 21:49:49 +02:00
omar
dc021f1c23
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
2018-07-09 21:38:37 +02:00
omar
9dea27b273
Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)
2018-07-09 21:18:41 +02:00
omar
140ece0aeb
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
2018-07-09 21:18:10 +02:00
omar
7abf72ec78
Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. ( #1542 )
2018-07-09 21:13:51 +02:00
omar
17f36038e0
Internals: Misc/shallow merge from Docking branch.
2018-07-09 21:10:47 +02:00
omar
574185426c
Internals: Misc/shallow merge from Docking branch.
2018-07-09 21:06:46 +02:00
omar
7033b2043b
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
2018-07-09 20:34:12 +02:00
omar
dd61c4802a
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
2018-07-09 19:22:49 +02:00
omar
c7016c25e8
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
2018-07-09 19:16:48 +02:00
omar
14cef31467
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-09 16:24:01 +02:00
omar
0708f91617
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
2018-07-09 16:20:14 +02:00
omar
bd6097ac6f
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. ( #143 ) + additional safety checks.
2018-07-08 20:06:49 +02:00
omar
64938178b7
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
2018-07-08 18:23:12 +02:00
omar
a33f0d1f7f
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. ( #143 )
2018-07-08 16:38:57 +02:00
vby
3a42eb6620
Fix missing ImmReleaseContext in default Win32 IME handler ( #1932 )
2018-07-08 15:24:12 +02:00
omar
b0cdfe0ece
Generalized d11d211e
so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. ( #1909 )
2018-07-08 13:27:16 +02:00
omar
6277781e83
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-07-08 13:08:16 +02:00
omar
c790723cfa
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). ( #1875 , #143 )
2018-07-08 13:03:39 +02:00
omar
d11d211e5d
Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. ( #1909 ) Wider generalization of b16603745c
.
2018-07-06 18:29:39 +02:00
omar
42bf149ac6
Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true
to enable the feature globally. ( #1495 ) The feature is not currently enabled by default because it is not satisfying enough.
2018-07-06 15:30:21 +02:00
omar
0146f4b456
Internals: BeginChildEx tweaks.
2018-07-05 09:17:16 +02:00
omar
7b2662d245
Examples: Comments, bits of documentation
2018-07-04 19:06:28 +02:00
omar
665bd1e140
Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.
2018-07-04 10:29:28 +02:00
omar
770cba0bd0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
2018-07-02 20:13:16 +02:00
omar
004fe8916a
Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)
2018-06-28 18:42:38 +02:00
omar
b16603745c
Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. ( #1909 )
2018-06-28 11:33:03 +02:00
omar
7adae3299e
Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments
2018-06-27 17:29:31 +02:00
omar
c38fe6b0e1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-06-26 12:41:36 +02:00
omar
79153cf19f
Internals: Various renaming. e.g. NewFrameUpdateHoveredWindowAndCaptureFlags() to UpdateHoveredWindowAndCaptureFlags() + exposed UpdateMovingWindow() in imgui_internal.h.
2018-06-26 12:40:37 +02:00
omar
14ceaaf460
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
2018-06-26 12:37:20 +02:00
omar
9d67d18d86
Internals: Moved some of the SliderBehaviorT code into SliderBehavior to reduce the amount of instanciated code.
2018-06-25 14:01:21 +02:00
omar
c1d8dee6c5
Version 1.63 WIP
2018-06-25 09:40:09 +02:00
omar
ce500f8727
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
2018-06-22 12:01:42 +02:00
omar
1b74e3be02
Version 1.62
2018-06-22 09:41:25 +02:00
omar
40845852b9
Fixed warnings + readme
2018-06-16 10:23:11 +02:00
omar
7e6700d261
Viewport: Fix lagging overlay clipping rectangle on viewport owning window (affecting sync of multi-layered docking overlays). This was extremely tricky to find and fix (*). ( #1541 )
...
(*) Merely assigning viewport->Pos = pos in UpdateMovingWindow() broke a series of thing because the code that assign viewports and viewport flags relied on moving window leaving its own viewport the first time to set the NoInputs flag.
2018-06-15 19:40:17 +02:00
omar
c71522adc5
Viewport: Comments. Removed misleading test for !window->ViewportOwned in UpdateSelectWindowViewport(). ( #1541 )
2018-06-15 19:40:00 +02:00
omar
70b0bd13aa
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
2018-06-14 15:30:15 +02:00
omar
b5d385824d
Added assert in TreePop() to ease catching ID stack underflow earlier.
2018-06-14 15:11:14 +02:00
omar
826d77185e
Revert 640c0566
: TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless -> more flexible to keep allowing it by default so it setup an ID scope.
2018-06-14 15:10:46 +02:00
omar
ce0b36ba10
Added _None values to various enum flags, useful for readability and some coding style likes it. (Unfortunately we can't refer to them as default value in imgui.h functions because they need to be declared below).
2018-06-13 23:22:19 +02:00
omar
2a6fbb2197
Speculative fix for Win32 clipboard handler if SetClipboardText() fails + Minor fix for static analyzer + using :: prefix when calling in Win32 functions.
2018-06-13 22:22:52 +02:00
omar
d57fc7fb97
Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. ( #820 , #956 , #1875 )
2018-06-13 00:10:33 +02:00
omar
be4b8b5615
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
2018-06-13 00:02:19 +02:00
omar
cd455a4600
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. ( #820 , #956 , #1875 )
2018-06-12 18:44:33 +02:00
omar
c725710c6d
Comments
2018-06-12 18:25:04 +02:00
omar
24aeca3d0c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
2018-06-12 16:24:24 +02:00
omar
cdf51cad2d
Comments, documentation
2018-06-11 19:52:40 +02:00
omar
ff4f40de41
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-06-08 20:22:07 +02:00
omar
85f9694bd4
Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )
...
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
2018-06-08 19:37:33 +02:00
omar
8c374512fd
Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. ( #1542 )
2018-06-07 22:10:31 +02:00
omar
8e48ab6b19
Nav: Addendum: only set io.WantSetMousePos if necessary. ( #1867 )
2018-06-07 18:08:59 +02:00
omar
e3710448ae
Nav: Removed an unnecessary assertion that could fail when using Mouse and Keyboard simultaneously with the NavEnableSetMousePos flag. ( #1867 )
2018-06-07 18:04:44 +02:00
omar
929529a0db
SliderFloat(): When using keyboard/gamepad and a zero precision format string (e.g. "%.0f"), always step in integer units. ( #1866 )
2018-06-07 13:29:54 +02:00
omar
b3a5b8debd
Popup: Improved handling of (erroneously) repeating calls to OpenPopup() to not fully close/re-open the popup so its child popups won't get closed. ( #1497 , #1533 , #1865 ).
...
Followup/fix the change made in deab2ab015
2018-06-06 19:25:49 +02:00
omar
5a288b2d3a
Readme, FAQ tweaks ( #1807 )
2018-06-06 13:02:19 +02:00
omar
d44faa165a
Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. ( #1859 )
...
Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.
2018-06-06 12:35:36 +02:00
omar
2a56105f85
TreeNodeEx(): The helper ImGuiTreeNodeFlags_CollapsingHeader flag now include ImGuiTreeNodeFlags_NoTreePushOnOpen. The flag was already set by CollapsingHeader(). The only difference is if you were using TreeNodeEx() manually with ImGuiTreeNodeFlags_CollapsingHeader and without ImGuiTreeNodeFlags_NoTreePushOnOpen. In which case you can remove the ImGuiTreeNodeFlags_NoTreePushOnOpen flag from your call (ImGuiTreeNodeFlags_CollapsingHeader & ~ImGuiTreeNodeFlags_NoTreePushOnOpen). ( #1864 )
2018-06-06 11:39:29 +02:00
omar
916528080e
InputTextMultiline(): Fixed double navigation highlight when scrollbar is active. ( #787 )
2018-06-05 16:16:54 +02:00
omar
512ffa37bd
Nav: Fixed clipped scoring when exiting a NavFlattened child back to a parent item (clipping not desirable then). (followup and fix to c665c15
). ( #787 )
2018-06-05 16:12:46 +02:00
omar
93b032ea92
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
2018-06-05 15:51:52 +02:00
omar
6d98c0323b
Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). ( #787 )
2018-06-05 15:49:33 +02:00
omar
2bdf0b54a2
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
2018-06-05 15:34:22 +02:00
omar
c665c15a7d
Nav: When entering into a NavFlattened child we only consider the visible items for scoring (note that this only work assuming the NavFlattened child window has interactive items). Fixes accidentally hoping into a NavFlattened child. ( #767 )
2018-06-04 18:18:12 +02:00
omar
f4120e20d5
Nav: NavFlattened: Fixed navigation miscrolling parent window when the current window is scrolling enough to keep the item in view. Fix feature added in e11610d6
, typically affect large navigation steps (used by PageUp/PageDown). + comments ( #787 )
2018-06-04 18:18:11 +02:00
omar
5a7e98c7cf
Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix.
2018-06-04 15:43:33 +02:00
omar
948009a8b2
Intensive FAQ answer for the million of people asking the same questions over and over again. ( #1848 , #1791 , #1840 , #1493 , #1295 )
2018-05-30 16:31:34 +02:00
omar
a2198bcf6b
Made mouse drag distance calculation more robust to invalid mouse position. ( #1845 )
2018-05-29 10:47:18 +02:00
omar
08e20ae465
Internals: Reintroducing LastActiveIdTimer because it is useful and to reduce merge conflicts. ( #1537 )
2018-05-28 21:48:25 +02:00
omar
d4b151076c
Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9
. ( #1739 , #143 ).
2018-05-28 21:40:09 +02:00
omar
3218666fb9
Made drag source tooltip display at the same position as a regular tooltip to avoid discontinuity where dynamically swapping tooltip at the target site. Made drag source tooltip override previous tooltip if any. ( #1739 , #143 ).
2018-05-28 21:24:03 +02:00
omar
92b7d6bc4f
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site ( #143 )
2018-05-28 20:57:41 +02:00
omar
7fd9199a1d
Internals: Selectable: Renamed variables. Todo update.
2018-05-28 17:13:40 +02:00
omar
f843facba4
Internals: PushItemFlag() flags are inherited by BeginChild().
2018-05-28 15:30:42 +02:00
omar
0e83d74698
Documentation: FAQ, ID Stack, Fonts ( #1839 , #1840 ), #1842 )
2018-05-27 22:32:46 +02:00
omar
03c8a78f04
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
2018-05-25 12:44:56 +02:00
omar
251f178a6f
Drag and Drop: Source doesn't report as hovered (at a lower-level). Source disable AllowOverlap flag if any set. ( #143 )
2018-05-24 18:05:50 +02:00
omar
b88fbd69cc
Drag and Drop: BeginDragDropSource(): Offset tooltip position so it is off the mouse cursor, but also closer to it than regular tooltips, and not clamped by viewport. ( #1739 )
2018-05-23 23:19:01 +02:00
omar
09ea376a6a
BeginCombo(), BeginMainMenuBar(), BeginChildFrame(): restore modified style at end of Begin instead of End so doesn't affect child windows, BeginTooltip() etc.. (allowed since 7b6b7038c5
)
2018-05-23 23:05:26 +02:00
omar
002e513b82
Added float GetWindowDpiScale(). ( #1542 , #1676 )
2018-05-23 18:25:37 +02:00
omar
ed84b2aaeb
Viewport, Platform: Fixed a crash if the back-end set the PlatformRequestMove/PlatformRequestSize flags while viewports were disabled (it happened in the SDL back-end, and generally we want to tolerate it to make back-end implementation simpler). ( #1542 )
2018-05-23 18:01:50 +02:00
omar
bf56b6b9a5
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. ( #1826 )
2018-05-21 10:13:21 +02:00
omar
1176460e44
Viewport: Fixed using ImGuiConfigFlags_ViewportsNoMerge always showing the Debug window by testing the Active flag as well. ( #1542 )
2018-05-19 20:45:49 +02:00
omar
6c684ae39b
Fixed GCC pre-8 build. ( #1822 ) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
2018-05-17 18:10:20 +02:00
omar
01429e7d16
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
2018-05-17 15:03:56 +02:00
omar
64b1645deb
Disabled GCC 8.1.0 warnings -Wclass-memaccess ( #1822 )
2018-05-17 14:19:20 +02:00
omar
d5c8f404b2
Remove trailing white spaces.
2018-05-17 14:12:37 +02:00
omar
ede5059e69
Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose
2018-05-17 10:48:15 +02:00
omar
4c35e00f49
Viewport: Made GetWindowViewport() not flag the window as written to.
2018-05-16 22:48:54 +02:00
omar
86f8cdbd98
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
2018-05-16 18:03:37 +02:00
omar
7f960616e0
Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. ( #1542 )
2018-05-16 14:34:46 +02:00
omar
1cafdb5b46
Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. ( #1542 )
2018-05-15 11:04:07 +02:00
omar
640c056602
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
2018-05-14 23:36:37 +02:00
omar
99ff6fc7e4
Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). ( #787 )
2018-05-14 23:07:35 +02:00
omar
e11610d6ff
Nav: To keep the navigated item in view we also attempt to scroll the parent window as well as the current window. ( #787 )
2018-05-14 19:50:48 +02:00
omar
036dce634e
Version 1.62 WIP
2018-05-14 19:19:19 +02:00
omar
b0fb340b57
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-05-14 13:15:21 +02:00
omar
78b28d545f
Version 1.61 + todo additions
2018-05-14 12:34:47 +02:00
omar
3f29ed6fd5
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
2018-05-13 23:41:43 +02:00
omar
725c13ca68
Fix for atof with glibc.
2018-05-13 22:43:43 +02:00
omar
2a2bb8970d
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
2018-05-13 22:31:29 +02:00
omar
ff033f431b
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
2018-05-13 21:04:07 +02:00
omar
7475c1e7dd
Data types: DragScalar: Fixed speed of integer values tweaking with keyboard/gamepad when speed < 1. Enforce min/max bounds when power curves are used. SliderScalar: Fixed integer/slow tweaking. ( #643 )
2018-05-12 17:39:34 +02:00
omar
85f3ba844c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
2018-05-11 22:22:41 +02:00
omar
fc7fc83f9e
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
2018-05-11 19:27:27 +02:00
omar
0dc18a6ca6
Documentation tweaks, comments
2018-05-11 16:54:50 +02:00
omar
8149408408
Merge branch 'data_types'
...
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
2018-05-11 16:48:50 +02:00
omar
14f575ff76
Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. ( #1804 )
2018-05-10 14:31:04 +02:00
omar
6eacddb50f
Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. ( #1542 )
2018-05-10 13:10:04 +02:00
omar
91e39e72a3
Combo: Horizontally offset items using WindowPadding instead of Indent, for consistency.
2018-05-09 23:12:35 +02:00
omar
773d484009
Internals: Made ContentsRegionRect absolute to reduce confusion. Renamed InnerRect to InnerMainRect, renamed WindowRectClipper to OuterRectClipped.
2018-05-09 23:12:34 +02:00
omar
f83f566530
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
2018-05-09 21:48:03 +02:00
omar
4cabf599c4
Data types: Fix format srtings with leading blanks. Fix ColorEdit4() to not use obsolete formats (when using IMGUI_DISABLE_OBSOLETE_FUNCTIONS) ( #643 )
2018-05-08 23:41:46 +02:00
omar
ad2927888b
Apply fix from data_types branch, some widgets broken when format string doesn't contains a %. Broken by 92f0165f85
. Data_types branch fix c5fb929555
.
2018-05-08 20:07:25 +02:00
omar
5f464877ed
Internals: Declaring DragBehavior, SliderBehavior in there (no warantee given) as they may be useful to custom widgets.
2018-05-08 19:52:56 +02:00
omar
c5fb929555
Data types: Fixed empty format string (or no % specifier) breaking the parsing back of values.
2018-05-08 19:52:55 +02:00
omar
280c05e4f8
Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.
2018-05-08 11:02:38 +02:00
omar
4ff23d3306
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2018-05-07 22:23:58 +02:00
omar
0bf43b3a1b
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. ( #923 , #993 )
2018-05-07 22:18:45 +02:00
omar
023cc25c7c
Internals: Removed unnecessary allocation indirection for g.LogClipboard (this only made sense when there was a global context instance)
2018-05-07 22:15:25 +02:00
omar
3e8087458d
SliderScalar, VSliderScalar(): Support for any data types. Tested with various ranges/limits. Note that Drag/Slider/Input currently fail if the format string doesn't preview the actual value. Will fix next. ( #320 , #643 , #708 , #1011 )
2018-05-04 20:55:51 +02:00
omar
944f414cc6
Internals: A few selected math helpers are now using template to handle all supported types. Added ImPow() to wrap float/double in a standard manner without calling pow(double) when not needed in Drag code.
2018-05-04 18:14:59 +02:00
omar
f4c16fbb99
Internals: Data types: Made format string optional. DragBehavior: Moved a bit of code outside of the template. Slider tidying up. Removed unnecessary call to fabsf().
2018-05-04 17:57:47 +02:00
omar
dcd26f1295
DragFloat, DragInt: Default format string is none is passed to the function. Fixed demo using old style %.0f.
2018-05-04 16:41:48 +02:00
omar
f47c756755
Internals: Missing const, some renaming. Tweak legacy fast path.
2018-05-03 22:12:55 +02:00
omar
0699ae161f
DragInt, DragScalar: Actually made the fast-past handle the now-most-common case..
2018-05-03 21:49:38 +02:00
omar
7640439747
DragInt: Patch old format strings to replace %f by %d when using the DragInt() entry point. ( #320 , #643 , #708 , #1011 )
2018-05-03 21:35:04 +02:00
omar
069b284f17
Internals: Tidying up internal helpers. Fixed a case ImParseFormatTrimDecorations() can return an off by one (out of bound) pointer if the format string is invalid. Extracted ImParseFormatFindEnd() out of TrimDecorations so we can use it to find the format type and replace the %f in old Int apis.
2018-05-03 20:22:29 +02:00
omar
086c3925c4
Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. ( #320 , #643 , #708 , #1011 )
2018-05-03 19:42:35 +02:00
omar
6c932479f2
Internal: DragScalar(), InputScalar() now support signed/unsigned, 32/64 bits, float/double data types. ( #320 , #643 , #708 , #1011 )
2018-05-03 17:34:38 +02:00
omar
93b8580a8d
Internals: DragFloat: Fixed power handling. Use an temporary accumulator and no absolute values so we will be able to manipulate double as well as 64-bit integers. ( #1011 , #708 , #320 )
2018-05-03 17:34:33 +02:00
omar
3f04fd0644
Internals: DragFloat: Removed DragSpeedScaleFast/DragSpeedScaleSlow since it's not yet usable and Nav version doesn't have an equivalent.
2018-05-03 17:34:29 +02:00
omar
4780ac1ca4
Internals: Data types: Added s64, u64 data types. Added support in InputScalar(). Removed internal.h InputScalarEx() to InputScalar(). Removed cheap-relative-operators support in recently added U32 data path, since this is heading toward being legacy code. + Fixed InputDouble parsing code. ( #1011 , #320 , #708 )
2018-05-03 17:34:22 +02:00
omar
d9fa1f869e
Comments about using "power curves". Demo tweaks. ( #648 )
2018-05-03 17:34:15 +02:00
omar
8a370f6491
SliderFloat: Fixed grab size and steps with %g format. ( #642 , #1301 )
2018-05-03 17:34:09 +02:00
omar
10e3f17235
DragFloat/SliderFloat internal InputScalar trim leading/trailing spaces emitted from the format string when presenting an edit box to the user. ( #648 )
...
Follow up to 6881d065b8
2018-05-03 17:34:02 +02:00
omar
a62f195e83
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
2018-05-03 17:33:55 +02:00
omar
ef05141a06
Internals: InputScalarEx: Tweak internals so there is a fast path for the simple case.
...
(in particular because it makes it clear what the extra code is for, so people tempted to create their own InputText data transform/handler understand how little is actually needed)
2018-04-30 20:12:14 +02:00
omar
ed756d474e
Internals: Added ImGuiDataType_Uint32 data type which is usable with InputScalarEx().
2018-04-30 20:02:33 +02:00
omar
7df985bc5c
Nav: Fixed hovering a Selectable() with the mouse so that it update the navigation cursor. Fixed c8b9b2c6
which was incorrect ( #787 )
2018-04-30 19:40:25 +02:00
omar
a1da7f9860
Internals: Tweaked ParseFormatPrecision(), clarified its more limited purpose, allowing 2-digits precisions since it makes (some) sense for doubles. ( #648 )
2018-04-30 16:52:16 +02:00
omar
92f0165f85
DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. ( #648 )
2018-04-30 16:44:57 +02:00
omar
6881d065b8
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. ( #648 )
2018-04-30 15:59:59 +02:00
omar
d7e24416dd
DragFloat/SliderFloat internal InputScalar relies on the user supplied format string to format and parse value. ( #648 )
...
The trailing text after the format will be displayed in the InputText but not affect back parsing. Ideally we can try to strip it later.
2018-04-30 15:21:51 +02:00
omar
f2e9dddeca
DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.
2018-04-28 10:43:15 +02:00
omar
f80314754c
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. ( #648 )
2018-04-28 00:11:40 +02:00
omar
73445ff248
Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. ( #648 , #642 )
2018-04-27 23:44:27 +02:00
omar
8a38271a7c
SliderFloat, DragFloat: Fix to allow input of scientific notation when Ctrl+Clicking a slider or drag, matching the change done in c19b2781
for InputFloat(). ( #648 , #1011 )
2018-04-27 23:18:28 +02:00
omar
066550de68
DragFloat, DragInt: Cancel mouse tweak when current value is initially past the min/max boundaries and mouse is pushing in the same direction (keyboard/gamepad version already did this).
2018-04-27 19:15:25 +02:00
omar
a84aff1875
Internals: DragBehavior: tweaks internals.
2018-04-27 18:22:10 +02:00
omar
1d99b5f963
Internals: Reordered parameters of DataTypeFormatString() internal helper functions and shallow tweaks.
2018-04-27 18:19:59 +02:00
omar
101f9b42b7
InputText: Fixed returning true when edition is cancelled with Esc and the current buffer matches the initial value.
2018-04-27 17:32:03 +02:00
omar
c47d34cf70
Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.
2018-04-27 15:13:22 +02:00
omar
cd51f37fc0
Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. ( #1542 )
2018-04-26 16:18:47 +02:00
omar
da70c837da
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. ( #1542 )
2018-04-26 15:30:19 +02:00
omar
f1ae07e532
Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. ( #1542 )
2018-04-26 11:52:38 +02:00
Bruce Mitchener
f8c9c33d33
Fixed static analyzers warnings with bool literals ( #1775 )
...
* Use `false` instead of `0` for a bool literal.
* Simplify calls to RadioButton to not need bool literals.
2018-04-26 09:51:46 +02:00
omar
d9cd494eaf
Viewport: Moved ScaleWindow* code in a proper location. Various comments.
2018-04-25 23:21:26 +02:00
omar
eb1c36fdfb
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. ( #1695 , #1769 )
2018-04-25 22:07:14 +02:00
omar
5979233a3c
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
2018-04-25 18:23:39 +02:00
omar
0b1d6a0d52
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2018-04-25 18:13:23 +02:00
omar
711a63befc
Misc: Stop moving window if mouse position becomes invalid. Flagged menus are _NoMove for sanity.
2018-04-25 17:58:54 +02:00
omar
d317d90610
Misc: NavCalcPreferredRefPos selects between mouse and nav reference position + added sanity assert (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
9cbca8c127
Begin: Shuffled some code, _should_ have no side-effect. Clear NextWindowData in one call and more consistently. (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
e3453d0dc4
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:53 +02:00
Bruce Mitchener
b28535d1da
ImGuiTextBuffer::appendfv needs to va_end the args_copy.
2018-04-25 17:40:39 +02:00
omar
7b433605f9
Viewport: Avoid creating viewport on drag (fix cc882b0723
)
2018-04-25 15:38:32 +02:00
omar
3b9b1956cd
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
2018-04-25 15:32:04 +02:00
omar
01fa934222
Internals: Removed unecessary Pos/PosFloat separation, only reason appears to be mostly pre-1.0. The only piece of code that I expected sub-pixel window position to matter actually already round its delta (wrongly so, will fix later/separately if we want).
2018-04-25 15:24:26 +02:00
omar
cc882b0723
Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). ( #1542 )
2018-04-25 15:14:51 +02:00
omar
6d6580f6be
Viewport: Fixed glitches with newly appearing menus creating viewport while the underlying imgui window should be hidden. ( #1542 )
2018-04-25 11:23:58 +02:00
omar
7684f53328
Viewport: Fixed issues with popups drifting in particular when reference mouse position become invalid (e.g. changing app focus while viewported-menu is open). Storing monitor index in viewport at beginning of the frame. ( #1542 )
2018-04-25 11:23:58 +02:00
Bruce Mitchener
7ebdadf92b
Fix various typos.
2018-04-25 09:40:14 +02:00
omar
e3e4b7bdf5
Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. ( #1542 )
...
Platform: Clarifying some comments in back-ends.
2018-04-24 17:10:27 +02:00